Merge branch 'simplify_PRT' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:41:08 +0000 (03:41 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:41:08 +0000 (03:41 -0500)
commit98b8797b496e1cc9ee04a5de38e24212c91a9cc6
treec7978abf4bba0a2718cd0f9c0c0efe93d734d226
parent83116211ad828efa654977d51829b18bf0add254
parentf5674439c927e650d5afc3f044eeef10b1b756c5
Merge branch 'simplify_PRT' into release

Conflicts:
drivers/acpi/pci_irq.c

Note that this merge disables
29dcaf9ba98320ff5c4f6a83702493a7e68add60
pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent

Signed-off-by: Len Brown <len.brown@intel.com>
include/acpi/platform/aclinux.h
include/linux/acpi.h