tree e86765ea91c5ef5c2bba93af048bc0be74e3a61f
parent 9b1be0f976a158590b924ac8789afe69b06dd302
parent 189b84fb54490ae24111124346a8e63f8e019385
author Linus Torvalds <torvalds@linux-foundation.org> 1387473046 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1387473046 -0800

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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