Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Tue, 13 Dec 2011 16:34:25 +0000 (16:34 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 13 Dec 2011 16:34:25 +0000 (16:34 +0000)

Trivial merge