| commit | 67e48f7280bf29afb1417ee293c67d6dc053191e | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Thu Jul 04 13:23:57 2013 -0700 |
| committer | Ethan Chen <intervigil@gmail.com> | Thu Jul 04 13:23:57 2013 -0700 |
| tree | e7a4308669625e290e0ce249f25554ab2590f9ab | |
| parent | c90854564c72c66124e70fda10fa67289b1a7560 [diff] | |
| parent | c9669e5c61143134936d1cb5307fd0caea9ccd7c [diff] |
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