Merge branch 'hisi/soc' into next/soc
authorKevin Hilman <khilman@linaro.org>
Wed, 8 Jan 2014 21:55:26 +0000 (13:55 -0800)
committerKevin Hilman <khilman@linaro.org>
Wed, 8 Jan 2014 21:55:33 +0000 (13:55 -0800)
commitd0f2a5ba07ac8dc671c0acb89d0114352b41e936
tree8b1e1594553dbb6a8480bc8d033d2bb0077f41fc
parente05f9ac42c1b87a1a266e3e83191ed00211576bc
parent0cfb1c8bec551c8eb7c6b263baebc9537d2b910c
Merge branch 'hisi/soc' into next/soc

* hisi/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/boot/dts/Makefile
arch/arm/configs/multi_v7_defconfig