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] Increase default nodes shift to 10, nr_cpus to 1024 [IA64] remove redundant local_irq_save() calls from sn_sal.h [IA64] panic if topology_init kzalloc fails [IA64-SGI] Silent data corruption caused by XPC V2.
Showing
- arch/ia64/Kconfig 2 additions, 2 deletionsarch/ia64/Kconfig
- arch/ia64/kernel/topology.c 2 additions, 4 deletionsarch/ia64/kernel/topology.c
- arch/ia64/sn/kernel/xpc_channel.c 2 additions, 2 deletionsarch/ia64/sn/kernel/xpc_channel.c
- arch/ia64/sn/kernel/xpc_main.c 16 additions, 12 deletionsarch/ia64/sn/kernel/xpc_main.c
- arch/ia64/sn/kernel/xpc_partition.c 8 additions, 16 deletionsarch/ia64/sn/kernel/xpc_partition.c
- include/asm-ia64/sn/sn_sal.h 0 additions, 6 deletionsinclude/asm-ia64/sn/sn_sal.h
- include/asm-ia64/sn/xp.h 18 additions, 4 deletionsinclude/asm-ia64/sn/xp.h
- include/asm-ia64/sn/xpc.h 3 additions, 1 deletioninclude/asm-ia64/sn/xpc.h
Loading
Please register or sign in to comment