Auto merge with /home/aegl/GIT/linus

author Tony Luck <[email protected]>

Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)

committer Tony Luck <[email protected]>

Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
author Tony Luck <[email protected]>
Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
committer Tony Luck <[email protected]>
Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
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
author	Tony Luck <[email protected]>
	Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
committer	Tony Luck <[email protected]>
	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