Merge branch 'imx/fixes' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 19:48:02 +0000 (20:48 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 19:48:02 +0000 (20:48 +0100)

Trivial merge