]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorKevin Hilman <khilman@linaro.org>
Wed, 8 Jan 2014 21:55:48 +0000 (13:55 -0800)
committerKevin Hilman <khilman@linaro.org>
Wed, 8 Jan 2014 21:56:33 +0000 (13:56 -0800)
commit757e75fc817b11fcebd509cb6500c57fb2dc99e3
treefdf02303e400ea4e1500d216b6522a5e97146fa4
parent5e59dd41794cc302003872fc1cd1306dc2111832
parentd0f2a5ba07ac8dc671c0acb89d0114352b41e936
Merge branch 'next/soc' into for-next

* next/soc:
  ARM: dts: rename hi4511 dts file
  ARM: hisi: remove init_time
  ARM: hisi: rename hi3xxx to hisi
  ARM: dts: enable clock binding on Hi3620
  ARM: hi3xxx: add hotplug support
  ARM: hi3xxx: add smp support
  ARM: config: add defconfig for Hi3xxx
  ARM: config: enable hi3xxx in multi_v7_defconfig
  ARM: dts: enable hi4511 with device tree
  ARM: hi3xxx: add board support with device tree

Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/Makefile
arch/arm/configs/multi_v7_defconfig