Merge branch 'linus' into tracing/sysprof
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:29:02 +0000 (12:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:29:02 +0000 (12:29 +0200)
commit37f5d732f34fa099676b2c52b8a57bab01a011de
treecca207ab2009e8d5d2097602133d1a20de2b2e5c
parented9e4996d9a123b7550e63713d563f524fa9d9f0
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into tracing/sysprof
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