tree 073f1fc21abf098d7667fcb898eda441c6b7f393
parent 63634c86365b530af5026d409fd403801abe1e75
parent 134fbadf028a5977a1b06b0253d3ee33e6f0c642
author Linus Torvalds <torvalds@linux-foundation.org> 1270674111 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270674111 -0700

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