]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx/soc' into for-next
authorShawn Guo <shawnguo@kernel.org>
Mon, 19 Oct 2015 15:20:14 +0000 (23:20 +0800)
committerShawn Guo <shawnguo@kernel.org>
Mon, 19 Oct 2015 15:20:14 +0000 (23:20 +0800)

Trivial merge