]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 18:16:02 +0000 (11:16 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 18:16:02 +0000 (11:16 -0700)
* next/soc:
  Documentation: devicetree: arm: sort enable-method entries
  ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE

1  2 
arch/arm/boot/dts/rk3066a.dtsi
arch/arm/boot/dts/rk3188.dtsi

Simple merge
Simple merge