diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-14 10:06:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-14 10:06:51 +0200 |
| commit | 26f45274afd938d82463816a12ec67448513294a (patch) | |
| tree | 97c232667794b039a9ef3a2ab4444311fb44cbfd /kernel/timer.c | |
| parent | Merge branch 'core/rcu' into perf/core (diff) | |
| parent | kprobes/x86: Fix to support jprobes on ftrace-based kprobe (diff) | |
| download | linux-26f45274afd938d82463816a12ec67448513294a.tar.xz linux-26f45274afd938d82463816a12ec67448513294a.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions