]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Jul 2016 21:37:37 +0000 (23:37 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Jul 2016 21:37:37 +0000 (23:37 +0200)
* 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


Trivial merge