Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Correct definition of handle_IPI [IA64] move SAL_CACHE_FLUSH check later in boot [IA64] MCA recovery: Montecito support [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access
Showing
- arch/ia64/kernel/mca_drv.c 68 additions, 27 deletionsarch/ia64/kernel/mca_drv.c
- arch/ia64/kernel/sal.c 7 additions, 4 deletionsarch/ia64/kernel/sal.c
- arch/ia64/kernel/setup.c 2 additions, 0 deletionsarch/ia64/kernel/setup.c
- arch/ia64/kernel/smp.c 7 additions, 5 deletionsarch/ia64/kernel/smp.c
- include/asm-ia64/sal.h 1 addition, 0 deletionsinclude/asm-ia64/sal.h
- include/asm-ia64/uaccess.h 1 addition, 1 deletioninclude/asm-ia64/uaccess.h
Loading
Please register or sign in to comment