Merge branch 'linus' into tracing/mmiotrace-mergefixups
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:16:46 +0000 (11:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:16:46 +0000 (11:16 +0200)
commitcb9aa97c21c59ad01c9514d7faf45dc166fba226
tree66a530f154db78b85f5b1406ebc51401df8d3913
parent668a6c3654560aef8741642478973e205a4f02bf
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into tracing/mmiotrace-mergefixups
12 files changed:
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/mm/ioremap.c
arch/x86/vdso/vclock_gettime.c
include/linux/sched.h
kernel/sched.c