Ingo Molnar ec5e61aabe Merge branch 'perf/urgent' into perf/core ...

Conflicts:
	arch/x86/kernel/cpu/perf_event.c

Merge reason: Resolve the conflict, pick up fixes

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

2010-04-02 19:38:10 +02:00

..

cpufreq

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

2010-03-07 12:52:38 -08:00

mcheck

x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y

2010-03-14 08:57:03 +01:00

mtrr

x86: fix mtrr missing kernel-doc

2010-03-05 11:46:03 -08:00

.gitignore

Update .gitignore files for generated targets

2008-10-20 11:24:31 -07:00

addon_cpuid_features.c

x86, cpu: Print AMD virtualization features in /proc/cpuinfo

2010-02-13 15:04:40 -08:00

amd.c

x86, amd: Get multi-node CPU info from NodeId MSR instead of PCI config space

2009-12-16 15:06:23 -08: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

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

cmpxchg.c

x86: move cmpxchg fallbacks to a generic place

2008-08-18 16:05:47 +02:00

common.c

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

2009-12-14 12:36:46 -08:00

cpu.h

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

cyrix.c

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

hypervisor.c

x86: Move tsc_calibration to x86_init_ops

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

intel_cacheinfo.c

Driver core: Constify struct sysfs_ops in struct kobj_type

2010-03-07 17:04:49 -08:00

intel.c

x86, perf, bts, mm: Delete the never used BTS-ptrace code

2010-03-26 11:33:55 +01:00

Makefile

x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG)

2010-01-23 18:27:47 -08:00

mkcapflags.pl

x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>

2008-08-27 19:23:22 -07:00

perf_event_amd.c

Merge branch 'perf/urgent' into perf/core

2010-04-02 19:38:10 +02:00

perf_event_intel_ds.c

perf, x86: Clean up debugctlmsr bit definitions

2010-03-26 09:41:03 +01:00

perf_event_intel_lbr.c

perf, x86: Clean up debugctlmsr bit definitions

2010-03-26 09:41:03 +01:00

perf_event_intel.c

perf, x86: Add Nehelem PMU programming errata workaround

2010-03-26 15:47:24 +01:00

perf_event_p4.c

perf, x86: Add Nehelem PMU programming errata workaround

2010-03-26 15:47:24 +01:00

perf_event_p6.c

perf, x86: Add Nehelem PMU programming errata workaround

2010-03-26 15:47:24 +01:00

perf_event.c

Merge branch 'perf/urgent' into perf/core

2010-04-02 19:38:10 +02:00

perfctr-watchdog.c

perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE

2010-03-01 14:21:23 +01:00

powerflags.c

x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>

2008-08-27 19:23:22 -07:00

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

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

umc.c

x86: move various CPU initialization objects into .cpuinit.rodata

2009-03-12 13:13:07 +01:00

vmware.c

x86: Print the hypervisor returned tsc_khz during boot

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