Merge branch 'msm/fixes' into next/fixes

This commit is contained in:
Arnd Bergmann 2011-07-21 16:53:43 +02:00
commit 1d9e5a2bda