diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-08-26 08:29:02 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-26 08:29:02 +0200 |
commit | 35dce1a99d010f3d738af4ce1b9b77302fdfe69c (patch) | |
tree | e34a37de965a79a2ae301de4d0557f500111dde6 /arch/x86/lib/inat.c | |
parent | tracing: add comments to explain TRACE_EVENT out of protection (diff) | |
parent | tracing: Create generic syscall TRACE_EVENTs (diff) | |
download | linux-35dce1a99d010f3d738af4ce1b9b77302fdfe69c.tar.xz linux-35dce1a99d010f3d738af4ce1b9b77302fdfe69c.zip |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Conflicts:
include/linux/tracepoint.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lib/inat.c')
0 files changed, 0 insertions, 0 deletions