From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Sep 2009 16:15:07 +0000 (-0700)
Subject: Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v2.6.32-rc1~611
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c1266ce4dc06bfd236cec31e11e9ecd69c0bef;p=pandora-kernel.git

Merge branch 'perfcounters-rename-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Tidy up after the big rename
  perf: Do the big rename: Performance Counters -> Performance Events
  perf_counter: Rename 'event' to event_id/hw_event
  perf_counter: Rename list_entry -> group_entry, counter_list -> group_list

Manually resolved some fairly trivial conflicts with the tracing tree in
include/trace/ftrace.h and kernel/trace/trace_syscalls.c.
---

43c1266ce4dc06bfd236cec31e11e9ecd69c0bef
Reading git-diff-tree failed