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: Revert "[IA64] fix percpu warnings" [IA64] fix percpu warnings [IA64] SMT friendly version of spin_unlock_wait() [IA64] use printk_once() unaligned.c/io_common.c [IA64] Require SAL 3.2 in order to do extended config space ops [IA64] unsigned cannot be less than 0 in sn_hwperf_ioctl() [IA64] Restore registers in the stack on INIT [IA64] Re-implement spinaphores using ticket lock concepts [IA64] Squeeze ticket locks back into 4 bytes.
Showing
- arch/ia64/include/asm/spinlock.h 41 additions, 21 deletionsarch/ia64/include/asm/spinlock.h
- arch/ia64/include/asm/spinlock_types.h 1 addition, 1 deletionarch/ia64/include/asm/spinlock_types.h
- arch/ia64/kernel/mca.c 57 additions, 47 deletionsarch/ia64/kernel/mca.c
- arch/ia64/kernel/unaligned.c 2 additions, 4 deletionsarch/ia64/kernel/unaligned.c
- arch/ia64/mm/tlb.c 18 additions, 6 deletionsarch/ia64/mm/tlb.c
- arch/ia64/pci/pci.c 7 additions, 2 deletionsarch/ia64/pci/pci.c
- arch/ia64/sn/kernel/io_common.c 2 additions, 6 deletionsarch/ia64/sn/kernel/io_common.c
- arch/ia64/sn/kernel/sn2/sn_hwperf.c 4 additions, 3 deletionsarch/ia64/sn/kernel/sn2/sn_hwperf.c
Loading
Please register or sign in to comment