]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx/soc' into imx/dt
authorShawn Guo <shawn.guo@freescale.com>
Sun, 22 Jun 2014 04:32:57 +0000 (12:32 +0800)
committerShawn Guo <shawn.guo@freescale.com>
Sun, 22 Jun 2014 04:32:57 +0000 (12:32 +0800)

Trivial merge