| commit | 09a818b021b0f6cadf602b85ff8c5e5ceada8b47 | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Wed Aug 28 16:40:27 2013 -0700 |
| committer | Ethan Chen <intervigil@gmail.com> | Wed Aug 28 16:40:27 2013 -0700 |
| tree | 37206885f07695d207dee0f174fbc72d74941ba5 | |
| parent | 51cc7b551add9c0be5982539f236f9145cd7f141 [diff] | |
| parent | 747b79875b3e85084869c6b51d35387f10419bbe [diff] |
Merge tag 'AU_LINUX_ANDROID_JB_2.6.04.03.00.109.025' into cm-10.2 AU_LINUX_ANDROID_JB_2.6.04.03.00.109.025 based on quic/aosp/jb_2.6 Conflicts: drivers/media/video/msm/msm_mctl.c drivers/media/video/msm/msm_v4l2_video.c Change-Id: Ib467ade6f770034967d1904ac11beace0053cea7