Pull ngam-maule-steiner into release branch
Tony Luck [Mon, 29 Aug 2005 22:48:51 +0000 (15:48 -0700)]
1  2 
arch/ia64/sn/kernel/io_init.c
arch/ia64/sn/kernel/sn2/sn_hwperf.c

Simple merge
Simple merge