Auto-update from upstream

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
		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