]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx/dt-3.14' into for-next
authorShawn Guo <shawn.guo@linaro.org>
Thu, 24 Oct 2013 14:46:33 +0000 (22:46 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Thu, 24 Oct 2013 14:46:33 +0000 (22:46 +0800)

Trivial merge