| commit | f54b2fe4aef9aa74ddf2c856928c3e29f3371fe7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 19 09:14:22 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 19 09:14:22 2009 -0800 |
| tree | 8ca38b4fab7d2a9a5bfd26a2e640631d52894fe6 | |
| parent | 83ff1af9d330348d1a6685b0c06d33847cd72723 [diff] | |
| parent | ed4a2f374d71770796789ed559c35a36bab82f1a [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: tracing: limit the number of loops the ring buffer self test can make tracing: have function trace select kallsyms tracing: disable tracing while testing ring buffer tracing/function-graph-tracer: trace the idle tasks