Merge branch 'imx/soc' into imx/dt
authorShawn Guo <shawn.guo@linaro.org>
Tue, 13 Jan 2015 11:17:50 +0000 (19:17 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Tue, 13 Jan 2015 11:17:50 +0000 (19:17 +0800)

Trivial merge