Merge branch 'fixes' of git://git.jdl.com/software/linux-3.0 into fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:27:34 +0000 (15:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:27:34 +0000 (15:27 +0000)

Trivial merge