Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2009 17:14:22 +0000 (09:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2009 17:14:22 +0000 (09:14 -0800)
commitf54b2fe4aef9aa74ddf2c856928c3e29f3371fe7
tree8ca38b4fab7d2a9a5bfd26a2e640631d52894fe6
parent83ff1af9d330348d1a6685b0c06d33847cd72723
parented4a2f374d71770796789ed559c35a36bab82f1a
Merge branch 'tracing-fixes-for-linus' of git://git./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