| commit | 0004ba495a41fa86e533e2e1c8a39e2c0cbec1cc | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Mon Jul 02 17:32:36 2012 -0700 |
| committer | Iliyan Malchev <malchev@google.com> | Mon Jul 02 17:32:36 2012 -0700 |
| tree | 03cdbb8dd9eea2d39d68e38c2f56685bf8164e7d | |
| parent | 119c37c394c6f49ca853d41a4c0dada5e709e048 [diff] | |
| parent | c445c30e1ad245cfd9abe64bb80b863162469435 [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 Signed-off-by: Iliyan Malchev <malchev@google.com>