Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Showing
- MAINTAINERS 2 additions, 2 deletionsMAINTAINERS
- arch/ia64/kernel/entry.S 2 additions, 2 deletionsarch/ia64/kernel/entry.S
- arch/ia64/kernel/mca.c 2 additions, 2 deletionsarch/ia64/kernel/mca.c
- arch/ia64/kernel/minstate.h 1 addition, 2 deletionsarch/ia64/kernel/minstate.h
- arch/ia64/kernel/perfmon.c 160 additions, 15 deletionsarch/ia64/kernel/perfmon.c
- arch/ia64/kernel/ptrace.c 17 additions, 3 deletionsarch/ia64/kernel/ptrace.c
- arch/ia64/kernel/smpboot.c 1 addition, 1 deletionarch/ia64/kernel/smpboot.c
- arch/ia64/kernel/sys_ia64.c 0 additions, 7 deletionsarch/ia64/kernel/sys_ia64.c
- arch/ia64/sn/kernel/setup.c 2 additions, 0 deletionsarch/ia64/sn/kernel/setup.c
- include/asm-ia64/perfmon.h 8 additions, 0 deletionsinclude/asm-ia64/perfmon.h
- include/asm-ia64/sn/sn_sal.h 27 additions, 1 deletioninclude/asm-ia64/sn/sn_sal.h
Please register or sign in to comment