| commit | d0f2a5ba07ac8dc671c0acb89d0114352b41e936 | [log] [tgz] |
|---|---|---|
| author | Kevin Hilman <khilman@linaro.org> | Wed Jan 08 13:55:26 2014 -0800 |
| committer | Kevin Hilman <khilman@linaro.org> | Wed Jan 08 13:55:33 2014 -0800 |
| tree | 8b1e1594553dbb6a8480bc8d033d2bb0077f41fc | |
| parent | e05f9ac42c1b87a1a266e3e83191ed00211576bc [diff] | |
| parent | 0cfb1c8bec551c8eb7c6b263baebc9537d2b910c [diff] |
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>