From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 11 Jun 2015 23:19:29 +0000 (-0700)
Subject: Merge branch 'zte/soc' into next/soc
X-Git-Tag: firefly_0821_release~176^2~1557^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d48614ec45aa20d6a2cb7d2eb1368d7641c747d;p=firefly-linux-kernel-4.4.55.git

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
---

4d48614ec45aa20d6a2cb7d2eb1368d7641c747d