Merge branch 'imx/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 16:32:28 +0000 (18:32 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 16:32:28 +0000 (18:32 +0200)

Trivial merge