diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-07 23:37:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-07 23:37:37 +0200 |
| commit | b6d90158c935d4a22e56f41647b479ab5ea449d4 (patch) | |
| tree | 802820a202d5bf1b02c904126d58bd2059efefea /arch/x86 | |
| parent | 45209046c47b93fadf26dc59a9da724f387b9cf2 (diff) | |
| parent | f7eca374f000bd8bd6aacc2619475fdba0b7ecca (diff) | |
| parent | 7e3fd813717693597daaa95dee875f4cb2d911ef (diff) | |
| download | linux-b6d90158c935d4a22e56f41647b479ab5ea449d4.tar.bz2 | |
Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'
* acpica-fixes:
ACPICA: Namespace: Fix namespace/interpreter lock ordering
* acpi-pci-fixes:
ACPI,PCI,IRQ: separate ISA penalty calculation
Revert "ACPI, PCI, IRQ: remove redundant code in acpi_irq_penalty_init()"
ACPI,PCI,IRQ: factor in PCI possible
* acpi-debug-fixes:
ACPI / debugger: Fix regression introduced by IS_ERR_VALUE() removal