]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Oct 2010 18:57:37 +0000 (11:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Oct 2010 18:57:37 +0000 (11:57 -0700)
commit39c12be86aaedd2f81bfb2236aca5333a2334dea
treeba3edacaa130bc875813674ed960b100c9158e64
parent231d0aefd88e94129cb8fb84794f9bb788c6366e
parent0f940cb7d970f4fd569bb5f9f49774422f2ccbee
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