| commit | a9e40a2493d805224f900d839b06188639b7ccd6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 28 12:25:02 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 28 12:25:02 2010 -0800 |
| tree | b33c9477a0728f6299a00a3e817aa26872019576 | |
| parent | 75f5d2c9bd36047364d1fb35c0720ab37df3be02 [diff] | |
| parent | ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556 [diff] |
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