From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2016 02:30:30 +0000 (-0700)
Subject: Merge tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: microblaze-4.10-rc1~1069
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=4496a1d9638644484d0d99e9de63742248f3c119;p=linux-2.6-microblaze.git

Merge tag 'trace-v4.7-3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Reviewing the selftest I recently submitted, I realize that the second
  part of it uses my old hack to get the PID of the spawned background
  tasks, which doesn't work for all shells, instead of the common use of
  $!"

* tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftracetest: Use proper logic to find process PID
---

4496a1d9638644484d0d99e9de63742248f3c119