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

Conflicts:
	include/media/msm_camera.h

Change-Id: Iee93f272f6023b7848c1ad8ed4f1f7c4ba61d1c5