Merge branch 'perfcounters-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 16:43:19 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 16:43:19 +0000 (09:43 -0700)
commitd46c7d9ab8289f23a5e161060b84fd7e63de7921
tree347f049f3c3c9dcd0c8e9edd459d7d6b9bbacfaf
parentc124891f50f11e33acdfa276864ea089bab726b6
parentb395cd8a74b4a8d943dd4b5585e676f62f7350b3
Merge branch 'perfcounters-fixes-for-linus-2' of git://git./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