Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
authorOlof Johansson <olof@lixom.net>
Thu, 10 Nov 2011 01:02:13 +0000 (17:02 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 10 Nov 2011 01:02:13 +0000 (17:02 -0800)

Trivial merge