]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 04:42:48 +0000 (21:42 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 04:43:35 +0000 (21:43 -0700)
commite0bad6381e72d51cf235842f430b921188c9edf0
tree3355f16ce0b628a98b60f023fcdc25e80d5ef675
parent5707fbcdd410c82e635539ca83106fedc529a2d3
parentb131eaa310f94c955cc02096a37a4f681486bfff
Merge branch 'next/dt' into for-next

* next/dt:
  ARM: Kirkwood add cpus definition needed by cpufreq driver to dtsi
  ARM: kirkwood: add i2c-gpio controller for km_kirkwood
  ARM: kirkwood: refactor dtsi to largest common nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/kirkwood-6281.dtsi
arch/arm/boot/dts/kirkwood-6282.dtsi
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/kirkwood.dtsi