Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 15:17:50 +0000 (15:17 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 15:17:50 +0000 (15:17 +0000)

Trivial merge