Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm