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)
commit54522b6613a03807f057fd567794a31267ef85cb
treeab0d9d47779769dc5d75810aaff21972958a681f
parent99f95e5286df2f69edab8a04c7080d986ee4233b
parentf2cbb4f01936a3e4225692e03b084b78c56d386d
Auto merge with /home/aegl/GIT/ia64-test
arch/ia64/kernel/entry.S
arch/ia64/kernel/ivt.S
arch/ia64/kernel/ptrace.c