| commit | 904d6c8c96ee7468e9b6ff6d389189a1a9f1dcd3 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Feb 06 19:04:55 2012 -0800 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Mon Feb 06 19:04:56 2012 -0800 |
| tree | a737285091687c7713779580934394728ef9d342 | |
| parent | b4c737be073fc4fb2b22562891c45bbd177df49a [diff] | |
| parent | 902c05e52663058bf8a6239e56bad11ba3f63d2e [diff] |
Merge changes I88bf28f0,I257a458a,Id87eab2c into msm-3.0 * changes: msm: hotplug: Wait for power collapse completion in platform_cpu_kill() msm: pm-8x60: Expose additional APIs through pm.h msm: pm: Move pm.h back into "mach-msm" from "mach-msm/include/mach"