From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Dec 2009 19:52:24 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.33-rc3~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d6e323c687c7b94c703c9b0900a74e5d262d462;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'perf-fixes-for-linus' of git://git./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
---

9d6e323c687c7b94c703c9b0900a74e5d262d462