From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Jan 2013 17:03:16 +0000 (-0800)
Subject: Merge tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~5901
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ffd4ebf9d19c07285ea8a26d30a17ff28767132;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'trace-3.8-rc2-regression-fix' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing regression fix from Steven Rostedt:
 "A change that came in this merge window broke the writing to the
  trace_options file.  It causes garbage to be read during the compare
  of option names, and breaks setting options via the trace_options
  file, although options can still be set via the options/<option>
  files."

* tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix regression of trace_options file setting
---

4ffd4ebf9d19c07285ea8a26d30a17ff28767132