diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-28 21:25:02 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-28 21:25:02 +0100 |
commit | a9e40a2493d805224f900d839b06188639b7ccd6 (patch) | |
tree | b33c9477a0728f6299a00a3e817aa26872019576 /fs | |
parent | Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139... (diff) | |
parent | perf: Fix the software context switch counter (diff) | |
download | linux-a9e40a2493d805224f900d839b06188639b7ccd6.tar.xz linux-a9e40a2493d805224f900d839b06188639b7ccd6.zip |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions