Merge branch 'linus' into tracing/mmiotrace
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Jul 2008 06:07:35 +0000 (08:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Jul 2008 06:07:35 +0000 (08:07 +0200)
commitd763d5edf945eec47bd443b699f174976f0afc13
tree3e5cd46b9a783999716bf92176854f4f1215d930
parent790e2a290b499b0400254e6870ec27969065d122
parent1b40a895df6c7d5a80e71f65674060b03d84bbef
Merge branch 'linus' into tracing/mmiotrace
14 files changed:
Makefile
arch/powerpc/kernel/irq.c
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
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