diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 12:03:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 12:03:43 -0700 |
| commit | 0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a (patch) | |
| tree | 3104b99ef5604ec9e17d6cd3ac2eadc80af2e9d8 /kernel/hrtimer.c | |
| parent | 46302b46e5cf9e23859360e38c540be6e3465c6b (diff) | |
| parent | f9ac5a69edee0ee7e06a05727226e3f275306c8d (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kmemtrace: Fix up tracer registration
tracing: Fix infinite recursion in ftrace_update_pid_func()
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions