commit 9d6e323c687c7b94c703c9b0900a74e5d262d462
author Linus Torvalds <torvalds@linux-foundation.org> Thu Dec 31 11:52:24 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Dec 31 11:52:24 2009 -0800
tree 82b6dfff0fa732cfabde42001482aad144bb3945
parent b21c07040304b8716e38a4a0e4ab60f386357e61
parent 4efb5290ae187514bd31af8c2d7755e175245e19

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 kmem: Fix statistics typo
  kprobes: Fix distinct type warning
  perf: Rename perf_event_hw_event in design document
  perf tools: Add missing header files to LIB_H Makefile variable
  perf record: We should fork only if a program was specified to run
  perf diff: Fix usage array, it must end with a NULL entry