]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2576e1 087da3b)
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)
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>
1  2 
include/acpi/platform/aclinux.h patch | diff1 | diff2 | blob | history
include/linux/acpi.h patch | diff1 | diff2 | blob | history

diff --cc include/acpi/platform/aclinux.h
Simple merge
diff --cc include/linux/acpi.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.