Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Dec 2013 17:10:46 +0000 (09:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Dec 2013 17:10:46 +0000 (09:10 -0800)
commit58cac3faefe26794dacda190dbd7bf374e3516d2
treee86765ea91c5ef5c2bba93af048bc0be74e3a61f
parent9b1be0f976a158590b924ac8789afe69b06dd302
parent189b84fb54490ae24111124346a8e63f8e019385
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