git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2576e1
087da3b
)
Merge branch 'simplify_PRT' into release
author
Len Brown
<len.brown@intel.com>
Fri, 9 Jan 2009 08:41:08 +0000
(
03:41
-0500)
committer
Len 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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff