Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

arch/ia64/Kconfig

arch/ia64/configs/sn2_defconfig

arch/ia64/kernel/setup.c

arch/ia64/lib/flush.S

arch/ia64/pci/pci.c

arch/ia64/sn/kernel/io_init.c

arch/ia64/sn/kernel/xpc_channel.c

arch/ia64/sn/pci/pci_dma.c

arch/ia64/sn/pci/pcibr/pcibr_provider.c

arch/ia64/sn/pci/tioca_provider.c

drivers/firmware/pcdp.h

include/asm-ia64/pci.h

include/asm-ia64/sn/pcibr_provider.h

include/asm-ia64/sn/pcibus_provider_defs.h

include/asm-ia64/sn/simulator.h

include/asm-ia64/topology.h