Ingo Molnar 4b62ac9a2b Merge branch 'x86/nmi' into x86/devel ... Conflicts: arch/x86/kernel/nmi.c arch/x86/kernel/nmi_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-08 12:17:08 +02:00
..
cpufreq	x86: coding style fixes to x86/kernel/cpu/cpufreq/cpufreq-nforce2.c	2008-06-18 15:00:14 +02:00
mcheck	Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel	2008-07-08 09:16:56 +02:00
mtrr	x86: rename two e820 related functions	2008-07-08 10:37:01 +02:00
addon_cpuid_features.c	x86: PAT: fixed checkpatch errors (and whitespaces)	2008-06-12 10:14:24 +02:00
amd_64.c	x86: make 64-bit identify_cpu use cpu_dev	2008-07-08 07:47:39 +02:00
amd.c	x86: Move PCI IO ECS code to x86/pci	2008-07-08 07:47:39 +02:00
bugs_64.c	x86: move bugs_64.c to cpu/bugs_64.c	2008-06-03 14:43:00 -07:00
bugs.c
centaur_64.c	x86: make 64-bit identify_cpu use cpu_dev	2008-07-08 07:47:39 +02:00
centaur.c
common.c
cpu.h	x86: make 64-bit identify_cpu use cpu_dev	2008-07-08 07:47:39 +02:00
cyrix.c
feature_names.c
intel_64.c	x86: make 64-bit identify_cpu use cpu_dev	2008-07-08 07:47:39 +02:00
intel_cacheinfo.c
intel.c
Makefile	x86: move bugs_64.c to cpu/bugs_64.c	2008-06-03 14:43:00 -07:00
perfctr-watchdog.c	x86: watchdog - check for CPU is being supported	2008-06-05 15:14:14 +02:00
proc.c
transmeta.c
umc.c