Merge branches 'pm-pci' and 'acpi-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 1 Oct 2015 20:30:12 +0000 (22:30 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 1 Oct 2015 20:30:12 +0000 (22:30 +0200)
commitdd953d318daad9a3c1f9a6bf31430bf40163051e
tree1ee2cc222183032028d9ec08e2c29964938dc3f5
parent9ffecb10283508260936b96022d4ee43a7798b4c
parenta8360062ccfb4b891d3013d0e55826c8bcb02bfb
parentd323efc786910bcc0c8f8b9f97780c70544ac4df
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