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

Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 08:01:47 -07:00

configs

tracing: Rename FTRACE_SYSCALLS for tracepoints

2009-08-26 00:17:35 +02:00

crypto

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 07:57:32 -07:00

ia32

perf: Do the big rename: Performance Counters -> Performance Events

2009-09-21 14:28:04 +02:00

include/asm

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

kernel

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

kvm

Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2009-09-14 17:43:43 -07:00

lguest

x86: Move get/set_wallclock to x86_platform_ops

2009-09-16 14:34:50 +02:00

lib

x86, msr: change msr-reg.o to obj-y, and export its symbols

2009-09-04 10:00:09 -07:00

math-emu

…

mm

perf: Do the big rename: Performance Counters -> Performance Events

2009-09-21 14:28:04 +02:00

oprofile

perf: Do the big rename: Performance Counters -> Performance Events

2009-09-21 14:28:04 +02:00

pci

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

power

x86: Remove final bits of CONFIG_X86_OLD_MCE

2009-09-18 08:31:23 +02:00

vdso

time: Introduce CLOCK_REALTIME_COARSE

2009-08-21 21:43:46 +02:00

video

…

xen

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

Kbuild

x86: standardize Kbuild rules

2009-04-16 18:09:02 +02:00

Kconfig

perf: Do the big rename: Performance Counters -> Performance Events

2009-09-21 14:28:04 +02:00

Kconfig.cpu

x86: add specific support for Intel Atom architecture

2009-08-23 11:20:02 +02:00

Kconfig.debug

kmemcheck: make kconfig accessible for other architectures

2009-06-15 15:49:17 +02:00

Makefile

Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 07:59:07 -07:00

Makefile_32.cpu

x86: add specific support for Intel Atom architecture

2009-08-23 11:20:02 +02:00