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