From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Feb 2011 17:25:55 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee88347755460e8ceb37e8453adcf5fd7ca5ff00;p=linux-beck.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: Fix throttle logic
  perf, x86: P4 PMU: Fix spurious NMI messages
---

ee88347755460e8ceb37e8453adcf5fd7ca5ff00