Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 12 Aug 2011 15:45:44 +0000 (15:45 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 12 Aug 2011 15:45:44 +0000 (15:45 +0000)

Trivial merge