| commit | 6125c2be96b941a08e05516cfa1125ca53945bb2 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu Mar 28 13:52:59 2013 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu Mar 28 13:52:59 2013 +0100 |
| tree | 9e13412f2d8002047f65ce88243891afe1539e5d | |
| parent | 887ede6661768a9d02d1f4b54ff719568473e00b [diff] | |
| parent | b8b6611048b7b57b86fbdc9153649ad4dc52135f [diff] |
Merge branch 'acpi-fixes' into fixes * acpi-fixes: PCI / ACPI: hold acpi_scan_lock during root bus hotplug ACPI / APEI: fix error status check condition for CPER ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M