]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit6125c2be96b941a08e05516cfa1125ca53945bb2
tree9e13412f2d8002047f65ce88243891afe1539e5d
parent887ede6661768a9d02d1f4b54ff719568473e00b
parentb8b6611048b7b57b86fbdc9153649ad4dc52135f
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