summaryrefslogtreecommitdiffstats
path: root/arch/s390/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-28 22:39:01 +0100
committerArnd Bergmann <arnd@arndb.de>2014-11-28 22:39:01 +0100
commite44cfd469bed0ccf0811c5b160f862b6958923f4 (patch)
tree086e0d8209d9e8eacd7920d2c29bc7c075a4a266 /arch/s390/Makefile
parent6ecbdabe51c6908c62bb43e28d2c82639ca8525a (diff)
parentdd6d2e5f4bbb828268506e9d6b772fffe101e76c (diff)
Merge tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux into next/dt
Pull "ARM: BCM5301X: Add some more devices to device tree" from Hauke Mehrtens: The most important part is adding the axi bus to the SoC dtsi file, this is the main bus on the SoC. These patches were all send to the arm list and I haven't got any negative responses. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux: ARM: BCM5301X: Add LEDs for Netgear R6250 V1 ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/s390/Makefile')
0 files changed, 0 insertions, 0 deletions