]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'acpi-fixes' into fixes
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Mar 2013 12:52:59 +0000 (13:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Mar 2013 12:52:59 +0000 (13:52 +0100)
* 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


Trivial merge