Merge branches 'acpi-scan', 'acpi-hotplug' and 'acpi-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:09:28 +0000 (23:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:09:28 +0000 (23:09 +0200)
commit4db367fd095d278dd92158e4b6ae7a737926d30b
tree3ac01ecfb532f8b56b6f2367beefde7c47ab10da
parentbf8102228a8bf053051f311e5486042fe0542894
parent2650ef42636848db858625bd933131e8835f8d23
parent45fef5b88d1f2f47ecdefae6354372d440ca5c84
parent6b90f55f63c75c2c65454aea6703c2ea91b9e372
Merge branches 'acpi-scan', 'acpi-hotplug' and 'acpi-pci'

* 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