diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-25 16:30:25 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-25 16:30:30 (GMT) |
| commit | 7d55718b0c19ba611241c330f688ee824e9bab79 (patch) | |
| tree | 7f1117dc44ac834d063b16c36d774d187646ab26 /arch/x86/kernel/Makefile | |
| parent | 6f893fb2e89287a4d755f928c3cda9d18440355c (diff) | |
| parent | de90add30e79261c3b5be68bb0f22d2ef98e8113 (diff) | |
| parent | f4166c54bfe04f64603974058e44fbd7cfef0ccc (diff) | |
| download | linux-7d55718b0c19ba611241c330f688ee824e9bab79.tar.xz | |
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.