Auto merge with /home/aegl/GIT/linus
Tony Luck [Wed, 15 Jun 2005 21:06:48 +0000 (14:06 -0700)]
1  2 
arch/ia64/kernel/entry.S
arch/ia64/kernel/fsys.S
arch/ia64/kernel/ptrace.c

Simple merge
Simple merge
Simple merge