git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b17e7e
1b11d78
)
[IA64] Manual merge fix for 3 files
author
Tony Luck
<tony.luck@intel.com>
Thu, 8 Sep 2005 21:27:13 +0000
(14:27 -0700)
committer
Tony Luck
<tony.luck@intel.com>
Thu, 8 Sep 2005 21:27:13 +0000
(14:27 -0700)
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff