summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-28 13:52:59 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-28 13:52:59 +0100
commit6125c2be96b941a08e05516cfa1125ca53945bb2 (patch)
tree9e13412f2d8002047f65ce88243891afe1539e5d /arch
parent887ede6661768a9d02d1f4b54ff719568473e00b (diff)
parentb8b6611048b7b57b86fbdc9153649ad4dc52135f (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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions