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

arch/ia64/kernel/Makefile

arch/ia64/kernel/acpi.c

arch/ia64/kernel/numa.c

arch/ia64/kernel/signal.c

arch/ia64/kernel/smpboot.c

arch/ia64/kernel/traps.c

arch/ia64/mm/discontig.c

arch/ia64/mm/init.c

arch/ia64/sn/include/xtalk/hubdev.h

arch/ia64/sn/kernel/io_init.c

arch/ia64/sn/kernel/irq.c

arch/ia64/sn/kernel/setup.c

arch/ia64/sn/kernel/tiocx.c

arch/ia64/sn/pci/pci_dma.c

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

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

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

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

arch/ia64/sn/pci/tioca_provider.c

drivers/pci/hotplug/Kconfig