Merge branch 'linus' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:15:58 +0000 (11:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:15:58 +0000 (11:15 +0200)
commite765ee90da62535ac7d7a97f2464f9646539d683
tree7a9cecce5aab958938e9a3bf46c2302d6af1958c
parenta4500b84c51645bbc86be3ca84f2252b7ada060f
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into tracing/ftrace
Makefile
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/mm/fault.c
arch/x86/mm/init_64.c
arch/x86/vdso/vclock_gettime.c
include/linux/sched.h
kernel/sched.c