Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.384' into cm-10.1

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

Conflicts:
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/gemini/msm_gemini_hw.h
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	include/media/msm_camera.h

Change-Id: I4995089fa838875cd0d7236c3f72f4a0148c6e35

Conflicts:
	arch/arm/mm/dma-mapping.c