Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 17:25:55 +0000 (09:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 17:25:55 +0000 (09:25 -0800)
commitee88347755460e8ceb37e8453adcf5fd7ca5ff00
tree6a604503807d1a342b4e58ffabe11bd2a26661ff
parent609b06f33506d92693cb89c303026f830f769c0d
parent4fe757dd48a9e95e1a071291f15dda5421dacb66
Merge branch 'perf-fixes-for-linus' of git://git./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: Fix throttle logic
  perf, x86: P4 PMU: Fix spurious NMI messages