Merge branch 'imx/dt' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)

Trivial merge