]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Sep 2009 16:15:07 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Sep 2009 16:15:07 +0000 (09:15 -0700)
commit43c1266ce4dc06bfd236cec31e11e9ecd69c0bef
tree40a86739ca4c36200f447f655b01c57cfe646e26
parentb8c7f1dc5ca4e0d10709182233cdab932cef593d
parent57c0c15b5244320065374ad2c54f4fbec77a6428
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.
arch/x86/kernel/apic/apic.c
include/linux/sched.h
include/linux/syscalls.h
include/trace/ftrace.h
init/Kconfig
kernel/Makefile
kernel/sched.c
kernel/trace/trace_syscalls.c