Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP [IA64] fix boot panic caused by offline CPUs [IA64] reorder Kconfig options to match x86 [IA64] Build VT-D iommu support into generic kernel [IA64] remove dead BIO_VMERGE_BOUNDARY definition [IA64] remove duplicated #include from pci-dma.c [IA64] use common header for software IO/TLB [IA64] fix the difference between node_mem_map and node_start_pfn [IA64] Add error_recovery_info field to SAL section header [IA64] Add UV watchlist support. [IA64] Simplify SGI uv vs. sn2 driver issues
No related branches found
No related tags found
Showing
- arch/ia64/Kconfig 10 additions, 9 deletionsarch/ia64/Kconfig
- arch/ia64/hp/common/hwsw_iommu.c 1 addition, 8 deletionsarch/ia64/hp/common/hwsw_iommu.c
- arch/ia64/include/asm/io.h 0 additions, 24 deletionsarch/ia64/include/asm/io.h
- arch/ia64/include/asm/machvec.h 1 addition, 21 deletionsarch/ia64/include/asm/machvec.h
- arch/ia64/include/asm/meminit.h 0 additions, 1 deletionarch/ia64/include/asm/meminit.h
- arch/ia64/include/asm/sal.h 14 additions, 1 deletionarch/ia64/include/asm/sal.h
- arch/ia64/include/asm/sn/sn_sal.h 45 additions, 0 deletionsarch/ia64/include/asm/sn/sn_sal.h
- arch/ia64/kernel/acpi.c 24 additions, 5 deletionsarch/ia64/kernel/acpi.c
- arch/ia64/kernel/pci-dma.c 0 additions, 2 deletionsarch/ia64/kernel/pci-dma.c
- arch/ia64/kernel/setup.c 5 additions, 4 deletionsarch/ia64/kernel/setup.c
- arch/ia64/mm/discontig.c 0 additions, 1 deletionarch/ia64/mm/discontig.c
- arch/ia64/uv/kernel/setup.c 6 additions, 0 deletionsarch/ia64/uv/kernel/setup.c
Loading
Please register or sign in to comment