From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2015 21:00:10 +0000 (-0700)
Subject: Merge tag 'trace-rb-bm-fix-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1663
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cff100f5d746465ca40e61cf296321ecf07d3f1c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'trace-rb-bm-fix-4.1-rc7' of git://git./linux/kernel/git/rostedt/linux-trace

Pull ring buffer benchmark buglet fix from Steven Rostedt:
 "Wang Long fixed a minor bug in the module parameter for the ring
  buffer benchmark, where the produce_fifo was being ignored and the
  producer thread's priority was being set with the consumer_fifo
  parameter"

* tag 'trace-rb-bm-fix-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ring-buffer-benchmark: Fix the wrong sched_priority of producer
---

cff100f5d746465ca40e61cf296321ecf07d3f1c