Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.292' of git://codeaurora.org/kernel/msm into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.040.292 based on quic/aosp/jb_2.5

Change-Id: Iaf790dce4acebe7b9177717c438694ba9665c789