Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

arch/ia64/Kconfig

arch/ia64/configs/sn2_defconfig

arch/ia64/hp/common/sba_iommu.c

arch/ia64/kernel/entry.S

arch/ia64/kernel/iosapic.c

arch/ia64/kernel/irq_ia64.c

arch/ia64/kernel/perfmon.c

arch/ia64/kernel/perfmon_default_smpl.c

arch/ia64/kernel/setup.c

arch/ia64/kernel/smpboot.c

arch/ia64/kernel/unwind.c

arch/ia64/lib/memcpy_mck.S

arch/ia64/mm/contig.c

arch/ia64/mm/discontig.c

arch/ia64/mm/fault.c

arch/ia64/mm/init.c

arch/ia64/sn/include/pci/pcibr_provider.h

arch/ia64/sn/kernel/Makefile

arch/ia64/sn/kernel/bte.c

arch/ia64/sn/kernel/bte_error.c