ac4f6190fae02a3dc30133f90488b996f726bf7a - android_kernel_htc_msm8960

commit	ac4f6190fae02a3dc30133f90488b996f726bf7a	[log] [tgz]
author	Ethan Chen <intervigil@gmail.com>	Wed Jun 19 12:47:21 2013 -0700
committer	Ethan Chen <intervigil@gmail.com>	Wed Jun 19 12:47:21 2013 -0700
tree	3b9e814cdc0e25cd603604908f62d83a07000fe5
parent	db499a9b9c662e30f253c7788e9fd2bd7a9a5f30 [diff]
parent	8b638b3285550f970980dbf42541a2136d5be68b [diff]

Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.375' into HEAD

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

Conflicts:
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.h
	drivers/media/video/msm/mercury/msm_mercury_hw.c
	drivers/media/video/msm/mercury/msm_mercury_hw.h
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/sensors/ov9724_v4l2.c
	drivers/media/video/msm/vfe/msm_vfe_stats_buf.c

Change-Id: Idd386f9f72ab4ce12039c4af12bc456b2f34c489

tree: 3b9e814cdc0e25cd603604908f62d83a07000fe5