Merge branch 'msm/fixes' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Jul 2011 14:53:43 +0000 (16:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 Jul 2011 14:53:43 +0000 (16:53 +0200)

Trivial merge