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)
commit155b2fd3d6862509ccb356ff20fff8115d36eedb
treeb15ce0bb088d3c1533345491ddd0dc4d1595aa38
parentee64100953e9657532cef5f7bdace3f8cc691c29
parent64546e9fe3a5b8cf62c946521c71d0532d399850
Merge branch 'imx/soc' into imx/dt