Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Apr 2019 16:41:14 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Apr 2019 16:41:14 +0000 (09:41 -0700)
Pull perf fix from Ingo Molnar:
 "A cstate event enumeration fix for Kaby/Coffee Lake CPUs"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters


Trivial merge