Merge branch 'linus' into tracing/ftrace
Ingo Molnar [Mon, 23 Jun 2008 09:11:42 +0000 (11:11 +0200)]
1  2 
Makefile
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/ppc_ksyms.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
kernel/sched.c

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