Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Jul 2015 18:46:32 +0000 (11:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Jul 2015 18:46:32 +0000 (11:46 -0700)
Pull perf fix from Thomas Gleixner:
 "A single fix for the intel cqm perf facility to prevent IPIs from
  interrupt context"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel/cqm: Return cached counter value from IRQ context


Trivial merge