]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.git/commitdiff
Merge branch 'auto-tracing-next' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 07:25:15 +0000 (09:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 07:25:15 +0000 (09:25 +0200)
1  2 
arch/x86/include/asm/processor.h
arch/x86/include/asm/ptrace.h
arch/x86/kernel/Makefile
arch/x86/kernel/entry_64.S
arch/x86/kernel/process.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
include/linux/sched.h
kernel/sched.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge