Merge branches 'at91/fixes', 'imx/fixes' and 'pxa/fixes' of git+ssh://master.kernel...
authorArnd Bergmann <arnd@arndb.de>
Sun, 17 Jul 2011 19:27:28 +0000 (21:27 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 17 Jul 2011 19:27:28 +0000 (21:27 +0200)

Trivial merge