summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-20 10:14:53 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-20 10:14:53 +0100
commit22de89b371a18086162eacd9f8c960299334ab01 (patch)
tree518227dde7ba892413163b32341c5d319da13949
parenttracing/ring-buffer: fix non cpu hotplug case (diff)
parentkprobes: Fix locking imbalance in kretprobes (diff)
parenttracing: fix command line to pid reverse map (diff)
parentaio: lookup_ioctx can return the wrong value when looking up a bogus context (diff)
downloadlinux-22de89b371a18086162eacd9f8c960299334ab01.tar.xz
linux-22de89b371a18086162eacd9f8c960299334ab01.zip
Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linus' into tracing/core