diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-25 17:30:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-25 17:30:30 +0100 |
| commit | 7d55718b0c19ba611241c330f688ee824e9bab79 (patch) | |
| tree | 7f1117dc44ac834d063b16c36d774d187646ab26 /arch/x86/kernel/ptrace.c | |
| parent | Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/power-tracer', 'tracing/powerpc', 'tracing/ring-buffer', 'tracing/stack-tracer' and 'tracing/urgent' into tracing/core (diff) | |
| parent | x86, bts: fix wrmsr and spinlock over kmalloc (diff) | |
| parent | x86, bts: DS and BTS initialization (diff) | |
| download | linux-dev-7d55718b0c19ba611241c330f688ee824e9bab79.tar.xz linux-dev-7d55718b0c19ba611241c330f688ee824e9bab79.zip | |
Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-branch-tracing
This pulls together all the topic branches that are needed
for the DS/BTS/PEBS tracing work.