tree b33c9477a0728f6299a00a3e817aa26872019576
parent 75f5d2c9bd36047364d1fb35c0720ab37df3be02
parent ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556
author Linus Torvalds <torvalds@linux-foundation.org> 1290975902 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1290975902 -0800

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 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