Linus Torvalds 43c1266ce4 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.		2009-09-21 09:15:07 -07:00
..
boot	powerpc/405ex: support cuImage via included dtb	2009-08-31 09:23:22 -04:00
configs	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00
include/asm	perf: Tidy up after the big rename	2009-09-21 14:34:11 +02:00
kernel	Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-21 09:06:31 -07:00
kvm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00
lib	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
math-emu
mm	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
oprofile	powerpc: Remove unnecessary semicolons	2009-07-08 13:50:21 +10:00
platforms	Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-21 09:15:07 -07:00
sysdev	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00
xmon	powerpc: Enable GCOV	2009-08-20 10:29:28 +10:00
Kconfig	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
Kconfig.debug	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Makefile	powerpc: Makefile simplification through use of cc-ifversion	2009-08-20 10:12:33 +10:00