]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-pci-hotplug-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 20 Aug 2013 23:24:41 +0000 (01:24 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 20 Aug 2013 23:24:41 +0000 (01:24 +0200)
* acpi-pci-hotplug-next:
  ACPI / PM: Hold acpi_scan_lock over system PM transitions

1  2 
drivers/acpi/sleep.c

Simple merge