From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Mar 2010 22:40:50 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.34-rc2~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8655e7e3ddec60603c4f6c14cdf642e2ba198df8;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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: Do not record user stack trace from NMI context
  tracing: Disable buffer switching when starting or stopping trace
  tracing: Use same local variable when resetting the ring buffer
  function-graph: Init curr_ret_stack with ret_stack
  ring-buffer: Move disabled check into preempt disable section
  function-graph: Add tracing_thresh support to function_graph tracer
  tracing: Update the comm field in the right variable in update_max_tr
  function-graph: Use comment notation for func names of dangling '}'
  function-graph: Fix unused reference to ftrace_set_func()
  tracing: Fix warning in s_next of trace file ops
  tracing: Include irqflags headers from trace clock
---

8655e7e3ddec60603c4f6c14cdf642e2ba198df8