From: Len Brown Date: Fri, 9 Jan 2009 08:41:08 +0000 (-0500) Subject: Merge branch 'simplify_PRT' into release X-Git-Tag: firefly_0821_release~15934^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ec9f168fcc344d2ffec1c8c822076bf22dab5c33;p=firefly-linux-kernel-4.4.55.git Merge branch 'simplify_PRT' into release Conflicts: drivers/acpi/pci_irq.c Note that this merge disables e1d3a90846b40ad3160bf4b648d36c6badad39ac pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent Signed-off-by: Len Brown --- ec9f168fcc344d2ffec1c8c822076bf22dab5c33