diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:17:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:17:17 +0200 |
| commit | a2fe194723f6e4990d01d8c208c7b138fd410522 (patch) | |
| tree | 7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /kernel/trace/trace_selftest.c | |
| parent | perf/x86: Fix intel_perfmon_event_mapformatting (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-a2fe194723f6e4990d01d8c208c7b138fd410522.tar.xz linux-a2fe194723f6e4990d01d8c208c7b138fd410522.zip | |
Merge branch 'linus' into perf/core
Pick up the latest ring-buffer fixes, before applying a new fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_selftest.c')
0 files changed, 0 insertions, 0 deletions