Merge commit 'linus/master' into tracing/kprobes
authorFrederic Weisbecker <fweisbec@gmail.com>
Wed, 23 Sep 2009 21:08:43 +0000 (23:08 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Wed, 23 Sep 2009 21:08:43 +0000 (23:08 +0200)
commitd7a4b414eed51f1653bb05ebe84122bf9a7ae18b
treebd6603a0c27de4c138a1767871897e9cd3e1a1d2
parent1f0ab40976460bc4673fa204ce917a725185d8f2
parenta724eada8c2a7b62463b73ccf73fd0bb6e928aeb
Merge commit 'linus/master' into tracing/kprobes

Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c

Merge reason:
Sync with latest significant tracing core changes.
18 files changed:
arch/x86/Makefile
arch/x86/kernel/entry_64.S
arch/x86/kernel/ptrace.c
arch/x86/lib/Makefile
arch/x86/mm/fault.c
include/linux/ftrace_event.h
include/linux/kprobes.h
include/linux/syscalls.h
include/trace/ftrace.h
kernel/kprobes.c
kernel/trace/Kconfig
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_profile.c
kernel/trace/trace_events.c
kernel/trace/trace_export.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c