Merge branch 'linus' into tracing/mmiotrace-mergefixups
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:28:47 +0000 (12:28 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:28:47 +0000 (12:28 +0200)
commitf4628e644c34d9e6242ea18487b2ed58ee04e3eb
tree3e1cd355fb6959d5b9f569342e4533a48e53aa11
parentcb9aa97c21c59ad01c9514d7faf45dc166fba226
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into tracing/mmiotrace-mergefixups
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