]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 20:23:09 +0000 (13:23 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 20:23:18 +0000 (13:23 -0700)
Merge "ARM: mach-bcm dt updates for 3.15" from Matt Porter:

- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support

* tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm:
  ARM: dts: remove bcm11351-brt.dts
  ARM: dts: Leave sdio1 as disabled on bcm28155-ap
  ARM: dts: bcm281xx: define real clocks
  ARM: BCM5301X: add dts files for BCM4708 SoC

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/boot/dts/Makefile

Simple merge