Ingo Molnar a2e7127153 Merge commit 'v2.6.32-rc6' into perf/core ...

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-11-04 11:59:45 +01:00

..

cpufreq

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

2009-09-20 15:54:37 -07:00

mcheck

x86: Don't print number of MCE banks for every CPU

2009-10-16 09:20:03 +02:00

mtrr

x86: Simplify bound checks in the MTRR code

2009-10-02 19:51:56 +02:00

.gitignore

…

addon_cpuid_features.c

…

amd.c

trivial: fix missing printk space in amd_k7_smp_check

2009-09-21 15:14:56 +02:00

bugs_64.c

x86/cpu: Clean up various files a bit

2009-07-11 11:24:09 +02:00

bugs.c

x86/cpu: Clean up various files a bit

2009-07-11 11:24:09 +02:00

centaur.c

…

cmpxchg.c

…

common.c

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

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

cpu_debug.c

percpu: cleanup percpu array definitions

2009-06-24 15:13:45 +09:00

cpu.h

…

cyrix.c

x86/cpu: Clean up various files a bit

2009-07-11 11:24:09 +02:00

hypervisor.c

x86: Move tsc_calibration to x86_init_ops

2009-08-31 09:35:47 +02:00

intel_cacheinfo.c

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

intel.c

x86: Move APERF/MPERF into a X86_FEATURE

2009-09-15 16:51:25 +02:00

Makefile

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

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

mkcapflags.pl

…

perf_event.c

perf_events, x86: Fix event constraints code

2009-10-13 08:19:53 +02:00

perfctr-watchdog.c

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

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

powerflags.c

…

proc.c

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

sched.c

sched: x86: Name old_perf in a unique way

2009-09-16 11:21:07 +02:00

transmeta.c

…

umc.c

…

vmware.c

x86: Print the hypervisor returned tsc_khz during boot

2009-09-20 20:25:36 +02:00