From: Len Brown <len.brown@intel.com>
Date: Fri, 9 Jan 2009 08:41:08 +0000 (-0500)
Subject: Merge branch 'simplify_PRT' into release
X-Git-Tag: v2.6.29-rc1~34^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ec9f168fcc344d2ffec1c8c822076bf22dab5c33;p=linux-2.6-omap-h63xx.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 <len.brown@intel.com>
---

ec9f168fcc344d2ffec1c8c822076bf22dab5c33