tree 1ee2cc222183032028d9ec08e2c29964938dc3f5
parent 9ffecb10283508260936b96022d4ee43a7798b4c
parent a8360062ccfb4b891d3013d0e55826c8bcb02bfb
parent d323efc786910bcc0c8f8b9f97780c70544ac4df
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1443731412 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1443731412 +0200

Merge branches 'pm-pci' and 'acpi-pci'

* pm-pci:
  PCI / PM: Update runtime PM documentation for PCI devices

* acpi-pci:
  ACPI / PCI: Remove duplicated penalty on SCI IRQ
  ACPI, PCI, irq: Do not share PCI IRQ with ISA IRQ