]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'imx/soc-3.14' and 'imx/dt-3.14' into for-next
authorShawn Guo <shawn.guo@linaro.org>
Wed, 23 Oct 2013 08:29:50 +0000 (16:29 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Wed, 23 Oct 2013 08:29:50 +0000 (16:29 +0800)

Trivial merge