]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'auto-ftrace-next' into tracing/for-linus
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 14:11:52 +0000 (16:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 14:11:52 +0000 (16:11 +0200)
commit5806b81ac1c0c52665b91723fd4146a4f86e386b
tree24ea8763bf308ce1407c1de91dc8de4d2655e1c1
parentd14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8
parent6712e299b7dc78aa4971b85e803435ee6d49a9dd
Merge branch 'auto-ftrace-next' into tracing/for-linus

Conflicts:

arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/lib/Makefile
include/asm-x86/irqflags.h
kernel/Makefile
kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
26 files changed:
Makefile
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
arch/x86/kernel/machine_kexec_32.c
arch/x86/kernel/machine_kexec_64.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/vsyscall_64.c
arch/x86/kernel/x8664_ksyms_64.c
arch/x86/lib/Makefile
arch/x86/mm/Makefile
arch/x86/mm/fault.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/ioremap.c
arch/x86/mm/pageattr.c
include/asm-x86/irqflags.h
include/linux/linkage.h
include/linux/sched.h
kernel/Makefile
kernel/printk.c
kernel/sched.c
kernel/sysctl.c