Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Aug 2013 23:57:40 +0000 (16:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Aug 2013 23:57:40 +0000 (16:57 -0700)
Pull perf fixes from Ingo Molnar:
 "Two small fixlets"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Add Haswell ULT model number used in Macbook Air and other systems
  perf/x86: Fix intel QPI uncore event definitions


Trivial merge