Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...