diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 10:25:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 10:25:18 +0100 |
commit | 1c511f740fe7031867f51831854360e8be1ba34c (patch) | |
tree | bd678fbc8117f751a3d1f8dc93b91c215ceaf66f /include | |
parent | tracing: fix sparse warning: attribute function with __acquires/__releases (diff) | |
parent | ring_buffer: pahole struct ring_buffer (diff) | |
parent | tracing/sysprof: add missing tracing_{start,stop}_record_cmdline() (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
download | linux-1c511f740fe7031867f51831854360e8be1ba34c.tar.xz linux-1c511f740fe7031867f51831854360e8be1ba34c.zip |
Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core