Merge branch 'imx/soc' into imx/dt
authorShawn Guo <shawn.guo@freescale.com>
Tue, 16 Sep 2014 02:24:58 +0000 (10:24 +0800)
committerShawn Guo <shawn.guo@freescale.com>
Tue, 16 Sep 2014 02:24:58 +0000 (10:24 +0800)

Trivial merge