]> err.no Git - linux-2.6/commitdiff
Auto merge with /home/aegl/GIT/ia64-test
authorTony Luck <tony.luck@intel.com>
Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
1  2 
arch/ia64/kernel/entry.S
arch/ia64/kernel/ivt.S
arch/ia64/kernel/ptrace.c

Simple merge
Simple merge
Simple merge