Merge branch 'linus' into tracing/sysprof
Ingo Molnar [Wed, 25 Jun 2008 10:29:02 +0000 (12:29 +0200)]
1  2 
Makefile
arch/powerpc/kernel/irq.c
arch/x86/Kconfig
arch/x86/kernel/Makefile
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
Simple merge
diff --cc kernel/sched.c
Simple merge