Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm