Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorArnd Bergmann <arnd@arndb.de>
Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 11 Jul 2011 21:53:01 +0000 (23:53 +0200)

Trivial merge