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
..
alpha	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
arm	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
blackfin	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
frv	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
h8300	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2009-09-18 09:33:07 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
m68k	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
m68knommu	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
microblaze	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
mips	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
mn10300	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
parisc	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
powerpc	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
s390	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
score	score: add TIF_NOTIFY_RESUME define in asm/thread_info.h	2009-09-17 12:05:56 +08:00
sh	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
sparc	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
um	includecheck fix: um, helper.c	2009-09-20 15:59:20 +05:30
x86	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
xtensa	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-18 09:15:24 -07:00
.gitignore
Kconfig	oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP	2009-09-17 15:53:42 -04:00