commit 5904b3b81d25166e5e39b9727645bb47937618e3
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jun 28 12:24:43 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jun 28 12:24:43 2010 -0700
tree 2a306f8b0cdea354b3ebc157623dededcf471091
parent f3866db8f7534ba8bbb342bebcf5ede542035528
parent b70e4f0529c089b00d0a6da13106db4de1ada4c7

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:
  tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h
  perf record: prevent kill(0, SIGTERM);
  perf session: Remove threads from tree on PERF_RECORD_EXIT
  perf/tracing: Fix regression of perf losing kprobe events
  perf_events: Fix Intel Westmere event constraints
  perf record: Don't call newt functions when not initialized