From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Dec 2013 17:10:46 +0000 (-0800)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~4750
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=58cac3faefe26794dacda190dbd7bf374e3516d2;p=firefly-linux-kernel-4.4.55.git

Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "An ABI documentation fix, and a mixed-PMU perf-info-corruption fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Document the new transaction sample type
  perf: Disable all pmus on unthrottling and rescheduling
---

58cac3faefe26794dacda190dbd7bf374e3516d2