diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-01 20:30:12 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-01 20:30:12 (GMT) |
| commit | dd953d318daad9a3c1f9a6bf31430bf40163051e (patch) | |
| tree | 1ee2cc222183032028d9ec08e2c29964938dc3f5 /drivers | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| parent | a8360062ccfb4b891d3013d0e55826c8bcb02bfb (diff) | |
| parent | d323efc786910bcc0c8f8b9f97780c70544ac4df (diff) | |
| download | linux-dd953d318daad9a3c1f9a6bf31430bf40163051e.tar.xz | |
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