Merge branch 'msm/fixes' into next/late
authorOlof Johansson <olof@lixom.net>
Fri, 28 Jun 2013 00:04:00 +0000 (17:04 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 28 Jun 2013 00:04:00 +0000 (17:04 -0700)
Merging in msm/fixes to avoid silly conflicts at top level.

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge