| commit | 1cecd791f2708b621e619cf4df4636c97c9497e5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 10:18:48 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 10:18:48 2011 -0800 |
| tree | 7d1cae2e3e0c02a5c187408fac36f0bae20fadf0 | |
| parent | fef86db8feb2618430ac9e3c9b6197a7eacaf27a [diff] | |
| parent | a252852afaea8270fcb91628b298253b112fc92e [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: x86: Fix text_poke_smp_batch() deadlock perf tools: Fix thread_map event synthesizing in top and record watchdog, nmi: Lower the severity of error messages ARM: oprofile: Fix backtraces in timer mode oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends