]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into imx/imx6q
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 21:35:51 +0000 (23:35 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 21:36:11 +0000 (23:36 +0200)

Trivial merge