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