Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5

author David Mosberger <davidm@tiger.hpl.hp.com>

Wed, 9 Jul 2003 02:57:12 +0000 (19:57 -0700)

committer David Mosberger <davidm@tiger.hpl.hp.com>

Wed, 9 Jul 2003 02:57:12 +0000 (19:57 -0700)
author David Mosberger <davidm@tiger.hpl.hp.com>
Wed, 9 Jul 2003 02:57:12 +0000 (19:57 -0700)
committer David Mosberger <davidm@tiger.hpl.hp.com>
Wed, 9 Jul 2003 02:57:12 +0000 (19:57 -0700)
diff --cc arch/ia64/kernel/sys_ia64.c
Simple merge
diff --cc arch/ia64/mm/init.c
Simple merge
author	David Mosberger <davidm@tiger.hpl.hp.com>
	Wed, 9 Jul 2003 02:57:12 +0000 (19:57 -0700)
committer	David Mosberger <davidm@tiger.hpl.hp.com>
	Wed, 9 Jul 2003 02:57:12 +0000 (19:57 -0700)
		1	2
arch/ia64/kernel/sys_ia64.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/mm/init.c	patch \|	diff1 \|	diff2 \|	blob \| history