From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jul 2015 21:42:40 +0000 (-0700)
Subject: Merge tag 'trace-v4.2-rc2-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~5006
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ad474de9349870f085b61c90bc80022702a78cc;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v4.2-rc2-fix2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing sample code fix from Steven Rostedt:
 "He Kuang noticed that the sample code using the trace_event helper
  function __get_dynamic_array_len() is broken.

  This only changes the sample code, and I'm pushing this now instead of
  later because I don't want others using the broken code as an example
  when using it for real"

* tag 'trace-v4.2-rc2-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix sample output of dynamic arrays
---

1ad474de9349870f085b61c90bc80022702a78cc