]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commite6a9d20e6b474f34773682523f06e040d5e8a9f4
treebd5cb206e91a934a5cf17bc3ed932913920b936f
parent82db6c3dfa4c2fffbada165af281a40049fa4fb7
parente1dc566f43fe2540ad085b1410cc130a06f69557
Merge branch 'next/soc' into for-next

* next/soc:
  Documentation: devicetree: arm: sort enable-method entries
  ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
arch/arm/boot/dts/rk3066a.dtsi
arch/arm/boot/dts/rk3188.dtsi