Ingo Molnar 73e21ce28d Merge branch 'perf/urgent' into perf/core ...

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

Merge in the latest fixes before applying new patches, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-04-21 10:57:33 +02:00

..

mcheck

The sweeping change is to make add_taint() explicitly indicate whether to disable

2013-02-25 15:41:43 -08:00

mtrr

taint: add explicit flag to show whether lock dep is still OK.

2013-01-21 17:17:57 +10:30

.gitignore

Update .gitignore files for generated targets

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

amd.c

The sweeping change is to make add_taint() explicitly indicate whether to disable

2013-02-25 15:41:43 -08:00

bugs_64.c

x86/cpu: Clean up various files a bit

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

bugs.c

x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag

2013-02-10 03:32:22 -05:00

centaur.c

x86, centaur: Enable cx8 for VIA Eden too

2011-12-15 08:04:42 -08:00

common.c

x86/common.c: load ucode in 64 bit or show loading ucode info in 32 bit on AP

2013-01-31 13:19:06 -08:00

cpu.h

x86/tlb_info: get last level TLB entry number of CPU

2012-06-27 19:28:24 -07:00

cyrix.c

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

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

hypervisor.c

x86/apic: Allow x2apic without IR on VMware platform

2013-01-24 13:11:18 +01:00

intel_cacheinfo.c

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

2013-02-19 20:09:48 -08:00

intel.c

Merge remote-tracking branch 'origin/x86/mm' into x86/mm2

2013-02-01 02:28:36 -08:00

Makefile

perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU

2012-10-04 13:32:37 +02:00

match.c

x86: Fix typo in MODULE_DEVICE_TABLE example: s/x86_cpu/x86cpu/

2012-04-16 14:20:19 +02:00

mkcapflags.pl

UAPI: Partition the header include path sets and add uapi/ header directories

2012-10-02 18:01:26 +01:00

mshyperv.c

X86: Handle Hyper-V vmbus interrupts as special hypervisor interrupts

2013-02-12 16:27:15 -08:00

perf_event_amd_ibs.c

treewide: Replace incomming with incoming in all comments and strings

2013-01-03 16:15:49 +01:00

perf_event_amd.c

perf/x86/amd: Enable northbridge performance counters on AMD family 15h

2013-02-16 09:37:27 +01:00

perf_event_intel_ds.c

Merge branch 'perf/urgent' into perf/core

2013-04-21 10:57:33 +02:00

perf_event_intel_lbr.c

perf/x86: Enable Intel Cedarview Atom suppport

2012-09-04 17:29:23 +02:00

perf_event_intel_uncore.c

perf/x86: Add flags to event constraints

2013-04-01 12:15:04 -03:00

perf_event_intel_uncore.h

perf/x86: Add cpumask for uncore pmu

2012-09-17 13:11:43 -03:00

perf_event_intel.c

Merge branch 'perf/urgent' into perf/core

2013-04-21 10:57:33 +02:00

perf_event_knc.c

perf/x86: Enable overflow on Intel KNC with a custom knc_pmu_handle_irq()

2012-10-24 12:00:49 +02:00

perf_event_p4.c

perf/x86: Rename Intel specific macros

2012-07-05 21:19:39 +02:00

perf_event_p6.c

perf/x86: Fix P6 driver section warning

2013-01-24 16:04:56 +01:00

perf_event.c

perf/x86: Add memory profiling via PEBS Load Latency

2013-04-01 12:16:31 -03:00

perf_event.h

perf/x86: Add support for PEBS Precise Store

2013-04-01 12:17:06 -03:00

perfctr-watchdog.c

perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU

2012-10-04 13:32:37 +02:00

powerflags.c

x86: Report cpb and eff_freq_ro flags correctly

2011-12-15 08:14:49 +01:00

proc.c

x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag

2013-02-10 03:32:22 -05:00

rdrand.c

x86, random: Verify RDRAND functionality and allow it to be disabled

2011-07-31 14:02:19 -07:00

scattered.c

x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM

2012-06-25 09:01:15 -07:00

topology.c

x86, cpu: Split addon_cpuid_features.c

2010-07-19 19:02:41 -07: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/apic: Allow x2apic without IR on VMware platform

2013-01-24 13:11:18 +01:00