| commit | 85fb0a1c35d86ed9a4de8d6cba79ba0801f7a1f7 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Sep 10 23:14:53 2013 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Sep 10 23:14:53 2013 +0200 |
| tree | 4373e14df0aa4064e64cf318edd3e07f5e162270 | |
| parent | a9238741987386bb549d61572973c7e62b2a4145 [diff] | |
| parent | 942f40155a743f4204308d62405dacaa4bfadb11 [diff] |
Merge branch 'acpi-hotplug' * acpi-hotplug: PM / hibernate / memory hotplug: Rework mutual exclusion PM / hibernate: Create memory bitmaps after freezing user space ACPI / scan: Change ordering of locks for device hotplug