commit d9795bafda02819105f8e91a0fce6c657ae55779
author Ethan Chen <intervigil@gmail.com> Mon Jul 22 10:56:03 2013 -0700
committer Ethan Chen <intervigil@gmail.com> Mon Jul 22 10:56:03 2013 -0700
tree cfa6c413100ffb2d5570244053ededcd6f3e47bf
parent 73a5d309beea98f65799b6c1b4f248ff4e723808
parent e2b6ece3cddd1da43c67aa17f89bd1e436b2e9f0

Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.432' into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.040.432 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/gemini/msm_gemini_sync.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_sync.c
	drivers/media/video/msm/mercury/msm_mercury_sync.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_vpe.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/video/msm/hdmi_msm.c

Change-Id: I57b6cff57599d10983cd3bff63a6f20e4d62655e