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

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

Change-Id: Ic3ab6aae4cf933f1c1f70594581b22aa88c80866