Merge branch 'zte/soc' into next/soc
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 23:19:29 +0000 (16:19 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 23:19:29 +0000 (16:19 -0700)
commit4d48614ec45aa20d6a2cb7d2eb1368d7641c747d
treeb1ff786973cb65fd3c4df4bf9cdf652f4d05f96c
parent259f47eb4411c2e7f50372bb388c074d5729cca2
parent405817f6780e18a9c4dc80a5883688df969608e8
Merge branch 'zte/soc' into next/soc

* zte/soc:
  ARM: zx: Add basic defconfig support for ZX296702
  ARM: dts: zx: add an initial zx296702 dts and doc
  clk: zx: add clock support to zx296702
  dt-bindings: Add #defines for ZTE ZX296702 clocks
drivers/clk/Makefile