commit | 6bcf1efb861710aaf42a76fb48fdb42854ea8e87 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Tue Apr 17 15:15:52 2012 -0700 |
committer | QuIC Gerrit Code Review <code-review@localhost> | Tue Apr 17 15:15:52 2012 -0700 |
tree | cd5a8b2150cc9cf85cbb1e256f0557ada2454572 | |
parent | 9ac575b9ad57b28323eb809c97ec7155f0d2ab25 [diff] | |
parent | d292ce796e304d57c940d3e76434963b05ff329b [diff] |
Merge changes I408fbfe1,I100166d9,I6ef0609d into msm-3.0 * changes: PM: Limit race conditions between runtime PM and system sleep (v2) USB: ensure parent device is resumed for child's system-resume usb: otg: Do not call runtime suspend from system suspend callback