tree 40a86739ca4c36200f447f655b01c57cfe646e26
parent b8c7f1dc5ca4e0d10709182233cdab932cef593d
parent 57c0c15b5244320065374ad2c54f4fbec77a6428
author Linus Torvalds <torvalds@linux-foundation.org> 1253549707 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253549707 -0700

Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/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.