Merge branch 'linus' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
commit97e6722b8d6b5880c4d5751127d5083b1b7df27d
tree060c52298d42530f975064f7addc4e637fe00289
parentf22f9a89ce6857d377bf22dba4c1a8cd256c5136
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into tracing/ftrace
Makefile
arch/x86/Kconfig
arch/x86/kernel/Makefile
kernel/sched.c