From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Apr 2010 21:01:51 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.34-rc4~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48de8cb7847d040c8892701c1ff3c55eff1f46b4;p=users%2Fdwmw2%2Flinux.git

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf, x86: Enable Nehalem-EX support
  perf kmem: Fix breakage introduced by 5a0e3ad slab.h script
---

48de8cb7847d040c8892701c1ff3c55eff1f46b4