| commit | 4f234f710f6ab6cd3ed97455715b14e6b4a93f34 | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Tue Jun 24 14:25:22 2014 -0700 |
| committer | Ethan Chen <intervigil@gmail.com> | Tue Jun 24 14:25:22 2014 -0700 |
| tree | 05b54b81da1c076fe663ec0a9efa923c1824c009 | |
| parent | 170cd053d8bd24bee7eaf912931428c2c2282ba5 [diff] | |
| parent | c4f1f8cec1e3c7e3526f6666939f22d23fcd8714 [diff] |
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.40' into cm-11.0 Conflicts: drivers/media/video/msm/csi/msm_ispif.c drivers/media/video/msm/msm_mctl_pp.c Change-Id: Iedfd6dc3e8dea93df993e0b043ab5eee55784a12