| commit | 39c12be86aaedd2f81bfb2236aca5333a2334dea | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 05 11:57:37 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 05 11:57:37 2010 -0700 |
| tree | ba3edacaa130bc875813674ed960b100c9158e64 | |
| parent | 231d0aefd88e94129cb8fb84794f9bb788c6366e [diff] | |
| parent | 0f940cb7d970f4fd569bb5f9f49774422f2ccbee [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 trace scripting: Fix extern struct definitions perf ui hist browser: Fix segfault on 'a' for annotate perf tools: Fix build breakage perf, x86: Handle in flight NMIs on P4 platform oprofile, ARM: Release resources on failure oprofile: Add Support for Intel CPU Family 6 / Model 29