| commit | 8852f51497c2de25c90f52221ffaf89fd5142744 | [log] [tgz] |
|---|---|---|
| author | Zhoulu Luo <zluo@codeaurora.org> | Fri Nov 15 12:31:25 2013 -0800 |
| committer | Zhoulu Luo <zluo@codeaurora.org> | Fri Nov 15 12:31:36 2013 -0800 |
| tree | 378688a651a30e1771a720d1ad979fb9099c1e5a | |
| parent | f0b3cd27cf41e4486d78a49154e145860dbbab90 [diff] | |
| parent | 5010a2cc7994112fc74bdcb27f3463fd59dec34f [diff] |
Merge remote-tracking branch 'remotes/quic/jb_3.2' into HEAD Conflicts: drivers/gpu/msm/adreno.h drivers/video/msm/mdss/mdss_mdp.h Change-Id: Ieed8c5392255cb6633ced85695877a3d81cc0d2c Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>