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] Fix large MCA bootmem allocation [IA64] Simplify cpu_idle_wait [IA64] Synchronize RBS on PTRACE_ATTACH [IA64] Synchronize kernel RSE to user-space and back [IA64] Rename TIF_PERFMON_WORK back to TIF_NOTIFY_RESUME [IA64] Wire up timerfd_{create,settime,gettime} syscalls
Showing
- arch/ia64/kernel/entry.S 4 additions, 1 deletionarch/ia64/kernel/entry.S
- arch/ia64/kernel/mca.c 26 additions, 29 deletionsarch/ia64/kernel/mca.c
- arch/ia64/kernel/perfmon.c 3 additions, 18 deletionsarch/ia64/kernel/perfmon.c
- arch/ia64/kernel/process.c 30 additions, 29 deletionsarch/ia64/kernel/process.c
- arch/ia64/kernel/ptrace.c 139 additions, 0 deletionsarch/ia64/kernel/ptrace.c
- include/asm-ia64/ptrace.h 11 additions, 0 deletionsinclude/asm-ia64/ptrace.h
- include/asm-ia64/thread_info.h 8 additions, 3 deletionsinclude/asm-ia64/thread_info.h
- include/asm-ia64/unistd.h 4 additions, 1 deletioninclude/asm-ia64/unistd.h
Loading
Please register or sign in to comment