Auto-update from upstream

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

Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)

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

Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)
author Tony Luck <tony.luck@intel.com>
Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)
committer Tony Luck <tony.luck@intel.com>
Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/pci/pci.c
Simple merge
diff --cc arch/ia64/sn/pci/tioce_provider.c
Simple merge
author	Tony Luck <tony.luck@intel.com>
	Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)
		1	2
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/sn/pci/tioce_provider.c	patch \|	diff1 \|	diff2 \|	blob \| history