]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commitec9f168fcc344d2ffec1c8c822076bf22dab5c33
treec7978abf4bba0a2718cd0f9c0c0efe93d734d226
parentb2576e1d4408e134e2188c967b1f28af39cd79d4
parent087da3b4e2d7d3ef70a4fa649b9a286fdeb0e44e
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>
include/acpi/platform/aclinux.h
include/linux/acpi.h