Merge branch 'pxa/fixes' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 20:26:37 +0000 (21:26 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 20:26:37 +0000 (21:26 +0100)

Trivial merge