]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-scan', 'acpi-hotplug' and 'acpi-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:27:35 +0000 (18:27 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:27:35 +0000 (18:27 +0200)
* acpi-scan:
  ACPI / scan: do not scan fixed hardware on HW-reduced platform

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

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


Trivial merge