]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'imx-mxs/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:00:55 +0000 (15:00 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:00:55 +0000 (15:00 +0200)
Conflicts:
arch/arm/mach-imx/mach-imx6q.c


No differences found