diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-10-02 19:08:24 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-10-02 19:08:24 +0400 |
commit | 4394a0014597bd53e2d9bbc69d091e3fbde7d00c (patch) | |
tree | a4f7b9b68aaf5a9a8542bba1f8ea2573838187f2 /net/mac80211/iface.c | |
parent | 5a6da55f10578b10f30ec72dcca6c37cbeac31ed (diff) | |
parent | 32c741d07f7fdb1974eb07420fc143d479bfe19f (diff) | |
download | linux-4394a0014597bd53e2d9bbc69d091e3fbde7d00c.tar.xz |
Merge tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu DT changes for v3.18 (round 2)" from Jason Cooper:
- Armada XP
- Add HW datasheet references to docs
- Armada 370
- Change internal registers to 0xf1000000 for Armada 370 RD board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000
Documentation: arm: add hardware datasheet reference for Marvell Armada XP
Diffstat (limited to 'net/mac80211/iface.c')
0 files changed, 0 insertions, 0 deletions