]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'imx/soc' and 'imx/dt' into for-next
authorShawn Guo <shawn.guo@linaro.org>
Sat, 14 Dec 2013 14:13:53 +0000 (22:13 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Sat, 14 Dec 2013 14:13:53 +0000 (22:13 +0800)

Trivial merge