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
..
acpi	includecheck fix: include/acpi, acpi_bus.h	2009-09-20 16:02:39 +05:30
asm-generic	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
crypto
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-21 08:10:09 -07:00
keys
linux	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
math-emu
media
mtd
net
pcmcia
rdma
rxrpc
scsi
sound
trace	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
video
xen
Kbuild