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

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

Change-Id: I1cc84a728c21fb8b79a89ad1935e572c4713dafc

Conflicts:
	drivers/media/video/msm/gemini/msm_gemini_hw.h