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

Conflicts:
	arch/arm/mm/dma-mapping.c
	include/media/msm_camera.h

Change-Id: I11e8e7b480c61802d6c887ce8b0f6bab9a59cfef

Conflicts:
	include/media/msm_camera.h