Merge branch 'imx/fixes' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:43:22 +0000 (21:43 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:43:22 +0000 (21:43 +0200)

Trivial merge