diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:11:00 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:11:00 +0100 |
commit | 5250d329e38cdf7580faeb9c53c17d3588d7d19c (patch) | |
tree | 42b2d22e0dc9ae08a26167ba8f89cb3d9a8ad5af /kernel | |
parent | Merge branch 'x86/tsc' into tracing/core (diff) | |
parent | sched, trace: update trace_sched_wakeup() (diff) | |
parent | Revert "x86: disable X86_PTRACE_BTS" (diff) | |
parent | ring-buffer: prevent false positive warning (diff) | |
parent | Linux 2.6.28 (diff) | |
download | linux-5250d329e38cdf7580faeb9c53c17d3588d7d19c.tar.xz linux-5250d329e38cdf7580faeb9c53c17d3588d7d19c.zip |
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core