Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Thu, 8 Dec 2011 15:52:23 +0000 (15:52 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 8 Dec 2011 15:52:23 +0000 (15:52 +0000)

Trivial merge