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

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

Change-Id: Ia0615c2dbe67b58640c8029efce0e6553b4ddd09