Ingo Molnar b2eafe890d Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict ...

'cpu_has_pse' has changed to boot_cpu_has(X86_FEATURE_PSE), fix this
up in the merge commit when merging the x86/urgent tree that includes
the following commit:

  103f6112f2 ("x86/mm/xen: Suppress hugetlbfs in PV guests")

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

2016-04-22 10:13:53 +02:00

..

mcheck

Merge tag 'v4.6-rc4' into x86/asm, to pick up fixes

2016-04-19 10:38:52 +02:00

microcode

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

2016-03-15 10:39:22 -07:00

mtrr

Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base

2016-04-13 11:36:19 +02:00

.gitignore

Update .gitignore files for generated targets

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

amd.c

x86/cpu: Simplify extended APIC ID detection on AMD

2016-04-13 11:37:42 +02:00

bugs_64.c

x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)

2016-02-03 10:30:03 +01:00

bugs.c

x86/fpu: Move various internal function prototypes to fpu/internal.h

2015-05-19 15:47:48 +02:00

centaur.c

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

2016-03-15 09:32:27 -07:00

common.c

x86/cpufeature: Replace cpu_has_tsc with boot_cpu_has() usage

2016-04-13 11:37:41 +02:00

cpu.h

x86/cpu: Restore MSR_IA32_ENERGY_PERF_BIAS after resume

2015-07-21 07:51:38 +02:00

cyrix.c

x86/cpufeature: Replace cpu_has_fpu with boot_cpu_has() usage

2016-04-13 11:37:40 +02:00

hypervisor.c

x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)

2016-02-03 10:30:03 +01:00

intel_cacheinfo.c

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

2016-03-15 09:32:27 -07:00

intel.c

x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage

2016-04-13 11:37:41 +02:00

Makefile

kernel: add kcov code coverage

2016-03-22 15:36:02 -07:00

match.c

x86/cpufeature: Carve out X86_FEATURE_*

2016-01-30 11:22:17 +01:00

mkcapflags.sh

x86/cpufeature: Carve out X86_FEATURE_*

2016-01-30 11:22:17 +01:00

mshyperv.c

x86/hyperv: Avoid reporting bogus NMI status for Gen2 instances

2016-04-16 11:18:21 +02: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/cpu: Add advanced power management bits

2016-03-29 11:12:11 +02:00

proc.c

x86: Replace cpu_**_mask() with topology_**_cpumask()

2015-05-27 15:22:17 +02:00

rdrand.c

x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)

2016-02-03 10:30:03 +01:00

scattered.c

x86/cpufeature: Move some of the scattered feature bits to x86_capability

2015-12-19 11:49:53 +01:00

topology.c

x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)

2016-02-03 10:30:03 +01:00

transmeta.c

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

2016-03-15 09:32:27 -07:00

umc.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

vmware.c

x86/cpufeature: Remove cpu_has_hypervisor

2016-03-31 13:35:07 +02:00