| commit | fa51cd052516bd0d6e42b28a3401dec9ed6d7262 | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Tue Jul 17 04:38:43 2012 -0700 |
| committer | Iliyan Malchev <malchev@google.com> | Tue Jul 17 04:38:43 2012 -0700 |
| tree | dd206b6f0bbdc54d4eca47f2a3aa641beab72f4a | |
| parent | 23c508a09d3413df25d3b2ca08994155a5eb5049 [diff] | |
| parent | 2bf044d74e1f30762b9a69ac87ee2e7da4b2f564 [diff] |
Merge remote-tracking branch 'coreaurora.org/msm-3.4' into android-msm-mako-3.4-wip Conflicts: arch/arm/mach-msm/clock-8960.c drivers/media/video/msm/msm.h Signed-off-by: Iliyan Malchev <malchev@google.com>