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

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