]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx/soc' into for-next
authorShawn Guo <shawn.guo@freescale.com>
Thu, 22 May 2014 01:05:17 +0000 (09:05 +0800)
committerShawn Guo <shawn.guo@freescale.com>
Thu, 22 May 2014 01:05:17 +0000 (09:05 +0800)

Trivial merge