Ingo Molnar f8a6b2b9ce Merge branch 'linus' into x86/apic ... Conflicts: arch/x86/kernel/acpi/boot.c arch/x86/mm/fault.c		2009-02-13 09:44:22 +01:00
..
cpufreq	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2009-02-09 13:58:22 -08:00
mcheck	x86: remove include of apic.h from hardirq_64.h	2009-01-23 11:03:29 +09:00
mtrr	x86: tone down mtrr_trim_uncached_memory() warning	2009-01-29 11:45:35 +01:00
.gitignore	Update .gitignore files for generated targets	2008-10-20 11:24:31 -07:00
addon_cpuid_features.c	x86: replace CONFIG_X86_SMP with CONFIG_SMP	2009-01-29 14:17:00 +01:00
amd.c	x86: remove mach_apic.h	2009-01-29 14:16:42 +01:00
bugs_64.c
bugs.c
centaur_64.c	x86: centaur_64.c remove duplicated setting of CONSTANT_TSC	2008-09-10 08:21:06 +02:00
centaur.c
cmpxchg.c
common.c	Merge branch 'x86/paravirt' into x86/apic	2009-02-09 12:16:59 +01:00
cpu.h
cyrix.c
hypervisor.c	x86: hypervisor - fix sparse warnings	2008-11-23 11:11:52 +01:00
intel_cacheinfo.c	Merge branch 'x86/urgent' into x86/apic	2009-02-05 22:30:01 +01:00
intel.c	Merge branch 'linus' into x86/apic	2009-02-13 09:44:22 +01:00
Makefile	Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-28 12:21:10 -08:00
mkcapflags.pl
perfctr-watchdog.c	ftrace: mark lapic_wd_event() notrace	2008-10-14 10:34:36 +02:00
powerflags.c
proc.c	x86/proc: fix /proc/cpuinfo cpu offline bug	2008-10-22 14:29:37 +02:00
transmeta.c	x86: move transmeta cap read to early_init_transmeta()	2008-09-14 14:09:14 +02:00
umc.c
vmware.c	x86: vmware - fix sparse warnings	2008-11-23 11:02:36 +01:00