| commit | 7f12b72bd8532cbbfb147470f0d902260cea36ce | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 18 03:13:46 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 18 03:13:46 2011 -0700 |
| tree | c62e7f0597faebd0e04acd34b3e6038629d849af | |
| parent | 8864f5ee12d03afe269edeeae440744f53ea4af1 [diff] | |
| parent | 52004ea7ca4c52a219362f973bfd1eb86ff668ce [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 evlist: Fix per thread mmap setup perf tools: Honour the cpu list parameter when also monitoring a thread list kprobes, x86: Disable irqs during optimized callback