]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx/devel' into next/devel
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:30:55 +0000 (15:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:30:55 +0000 (15:30 +0200)

Trivial merge