Auto merge with /home/aegl/GIT/ia64-test

author Tony Luck <[email protected]>

Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)

committer Tony Luck <[email protected]>

Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
author Tony Luck <[email protected]>
Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
committer Tony Luck <[email protected]>
Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
diff --cc arch/ia64/kernel/entry.S
Simple merge
diff --cc arch/ia64/kernel/ivt.S
Simple merge
diff --cc arch/ia64/kernel/ptrace.c
Simple merge
author	Tony Luck <[email protected]>
	Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
committer	Tony Luck <[email protected]>
	Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
		1	2
arch/ia64/kernel/entry.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/ivt.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/ptrace.c	patch \|	diff1 \|	diff2 \|	blob \| history