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)
commitbfd36050874d69db0548800a756456d180687f7b
tree5b01e0bb83f1855e1642776778408431f41b1d6a
parentb88a2595b6d8aedbd275c07dfa784657b4f757eb
parent0499bd867bd17c0a88963551a1583b8efc7b03d7
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

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