Pull altix-fpga-reset into release branch

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

Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)

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

Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
author Tony Luck <tony.luck@intel.com>
Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
committer Tony Luck <tony.luck@intel.com>
Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
diff --cc arch/ia64/sn/kernel/tiocx.c
Simple merge
diff --cc include/asm-ia64/sn/sn_sal.h
Simple merge
author	Tony Luck <tony.luck@intel.com>
	Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
		1	2
arch/ia64/sn/kernel/tiocx.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-ia64/sn/sn_sal.h	patch \|	diff1 \|	diff2 \|	blob \| history