From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Aug 2009 16:43:19 +0000 (-0700)
Subject: Merge branch 'perfcounters-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v2.6.31-rc7~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d46c7d9ab8289f23a5e161060b84fd7e63de7921;p=linux.git

Merge branch 'perfcounters-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Make 'make html' work
  perf annotate: Fix segmentation fault
  perf_counter: Fix the PARISC build
  perf_counter: Check task on counter read IPI
  perf: Rename perf-examples.txt to examples.txt
  perf record: Fix typo in pid_synthesize_comm_event
---

d46c7d9ab8289f23a5e161060b84fd7e63de7921