| commit | 6381ae7bba52db99284cccdc9a9efbcf69388930 | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Thu Jun 28 17:56:11 2012 -0700 |
| committer | Iliyan Malchev <malchev@google.com> | Thu Jun 28 17:56:11 2012 -0700 |
| tree | e431c028200c2c4933b1e14c204a693a4d883567 | |
| parent | 89443dc3f74ff0e45a4c1fee096d576a082bef69 [diff] | |
| parent | c432fdf28656051f358ff4b7cc41f43d4eeb3ed8 [diff] |
Merge remote-tracking branch 'coreaurora.org/msm-3.4' into android-msm-mako-3.4-wip Conflicts: drivers/video/msm/mdp.h sound/soc/msm/apq8064.c Signed-off-by: Iliyan Malchev <malchev@google.com>