From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Nov 2010 20:25:02 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9e40a2493d805224f900d839b06188639b7ccd6;p=openwrt%2Fstaging%2Fblogic.git

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 the software context switch counter
  perf, x86: Fixup Kconfig deps
  x86, perf, nmi: Disable perf if counters are not accessible
  perf: Fix inherit vs. context rotation bug
---

a9e40a2493d805224f900d839b06188639b7ccd6