projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75f5d2c
ee6dcfa
)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 28 Nov 2010 20:25:02 +0000
(12:25 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 28 Nov 2010 20:25:02 +0000
(12:25 -0800)
* '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
Trivial merge