Merge tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jan 2013 17:03:16 +0000 (09:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jan 2013 17:03:16 +0000 (09:03 -0800)
commit4ffd4ebf9d19c07285ea8a26d30a17ff28767132
treed563023f1764aac5c5232315c356fa258f53dcce
parent7be72c39544e3973509f1c299d255a67177c7a33
parenta8dd2176a8e988e3744e863ac39647a6f59fa900
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