diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-04 01:09:28 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-04 01:09:28 +0400 |
| commit | 4db367fd095d278dd92158e4b6ae7a737926d30b (patch) | |
| tree | 3ac01ecfb532f8b56b6f2367beefde7c47ab10da /include | |
| parent | bf8102228a8bf053051f311e5486042fe0542894 (diff) | |
| parent | 2650ef42636848db858625bd933131e8835f8d23 (diff) | |
| parent | 45fef5b88d1f2f47ecdefae6354372d440ca5c84 (diff) | |
| parent | 6b90f55f63c75c2c65454aea6703c2ea91b9e372 (diff) | |
| download | linux-4db367fd095d278dd92158e4b6ae7a737926d30b.tar.xz | |
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