Conflicts: drivers/acpi/pci_irq.c Note that this merge disables e1d3a90846 pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent Signed-off-by: Len Brown <len.brown@intel.com>
e1d3a90846