Pull ngam-maule-steiner into release branch

author Tony Luck <tony.luck@intel.com>

Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)

committer Tony Luck <tony.luck@intel.com>

Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)
author Tony Luck <tony.luck@intel.com>
Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)
committer Tony Luck <tony.luck@intel.com>
Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)
diff --cc arch/ia64/sn/kernel/io_init.c
Simple merge
diff --cc arch/ia64/sn/kernel/sn2/sn_hwperf.c
Simple merge
author	Tony Luck <tony.luck@intel.com>
	Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)
		1	2
arch/ia64/sn/kernel/io_init.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/sn/kernel/sn2/sn_hwperf.c	patch \|	diff1 \|	diff2 \|	blob \| history