tree 5b01e0bb83f1855e1642776778408431f41b1d6a
parent b88a2595b6d8aedbd275c07dfa784657b4f757eb
parent 0499bd867bd17c0a88963551a1583b8efc7b03d7
author Linus Torvalds <torvalds@linux-foundation.org> 1376438260 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1376438260 -0700

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