Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Oct 2009 19:05:00 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Oct 2009 19:05:00 +0000 (12:05 -0700)
commitb9d40b7b1e349bdc5c174b4ef1a333e62f7d749c
treef5c2d85ffb1f1dd21ae8254723ea9c595cf200d5
parent7c1632ba76d94b4847fde79f67faa91ef8571fe9
parente13dbd7d75d1ecc315c6e3071b3c4e8fba4f6bec
Merge branch 'perf-fixes-for-linus-2' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf_events: Make ABI definitions available to userspace
  perf tools: elf_sym__is_function() should accept "zero" sized functions
  tracing/syscalls: Use long for syscall ret format and field definitions
  perf trace: Update eval_flag() flags array to match interrupt.h
  perf trace: Remove unused code in builtin-trace.c
  perf: Propagate term signal to child