Auto-update from upstream
Tony Luck [Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)]
1  2 
arch/ia64/Kconfig
arch/ia64/pci/pci.c
arch/ia64/sn/pci/tioce_provider.c

Simple merge
Simple merge
Simple merge