]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-scan', 'acpi-hotplug', 'acpi-pci' and 'acpi-pad' into linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 May 2014 21:22:55 +0000 (23:22 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 May 2014 21:22:55 +0000 (23:22 +0200)
* acpi-scan:
  ACPI / scan: do not scan fixed hardware on HW-reduced platform

* acpi-hotplug:
  ACPI / notify: Clean up handling of hotplug events

* acpi-pci:
  ACPI / PCI: Stub out pci_acpi_crs_quirks() and make it x86 specific

* acpi-pad:
  ACPI / PAD: call schedule() when need_resched() is true


Trivial merge