Merge branch 'imx/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:44:48 +0000 (21:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:44:48 +0000 (21:44 +0200)

Trivial merge