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)
commit1d9e5a2bdaafee792fb68cd4381a292e9e340783
tree33e4a0fea0b2d4a08e1776c83c9f0a29d7fc1f90
parente8885cb68dbdaa0a292bf1defc98addd0aed9b04
parent41ff445cdb8b3d618425f8a16e2b873046bbe536
Merge branch 'msm/fixes' into next/fixes