projects
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f62c4a9
9a556e8
)
Auto merge with /home/aegl/GIT/linus
Tony Luck [Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)]
1
2
arch/ia64/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/ia64/kernel/setup.c
patch
|
diff1
|
diff2
|
blob
|
history
include/asm-ia64/pci.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/ia64/Kconfig
Simple merge
diff --cc
arch/ia64/kernel/setup.c
Simple merge
diff --cc
include/asm-ia64/pci.h
Simple merge