From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jan 2014 16:22:30 +0000 (-0800)
Subject: Merge tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: accepted/tizen/common/20141203.182822~707
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba635f8cd20ebc7bddf1eb8e1f4eae28a034e916;p=platform%2Fkernel%2Flinux-arm64.git

Merge tag 'trace-fixes-3.14' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "The first two patches fix the debugfs README file to reflect better
  the new features added to 3.14.

  The third patch is a minor bugfix to the trace_puts() functions that
  will crash the system if a developer adds one before the tracing
  system is setup.  It also affects trace_printk() if it has no
  arguments, as the code will convert it to a trace_puts() as well.

  Note, this bug will not affect unmodified kernels, as trace_printk()
  and trace_puts() should only be used by developers for testing"

* tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Check if tracing is enabled in trace_puts()
  tracing: Fix formatting of trace README file
  tracing/README: Add event file usage to tracing mini-HOWTO
---

ba635f8cd20ebc7bddf1eb8e1f4eae28a034e916