Pull altix-fpga-reset into release branch
authorTony Luck <tony.luck@intel.com>
Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 28 Oct 2005 18:14:47 +0000 (11:14 -0700)
1  2 
arch/ia64/sn/kernel/tiocx.c
include/asm-ia64/sn/sn_sal.h

Simple merge
Simple merge