Merge branch 'imx/soc' into imx/dt
authorShawn Guo <shawn.guo@linaro.org>
Mon, 30 Mar 2015 08:37:04 +0000 (16:37 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 30 Mar 2015 08:37:04 +0000 (16:37 +0800)

Trivial merge