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

Trivial merge