Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit ... Conflicts: arch/x86/Kconfig block/blktrace.c kernel/irq/handle.c Semantic conflict: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-03-06 16:45:01 +01:00
..
cpufreq	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
mcheck	x86, mce: fix build failure in arch/x86/kernel/cpu/mcheck/threshold.c	2009-03-04 11:48:28 +01: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, apic: remove genapic.h	2009-02-17 17:52:44 +01:00
amd.c	x86, apic: remove duplicate asm/apic.h inclusions	2009-02-17 17:52:44 +01:00
bugs.c
bugs_64.c
centaur.c
centaur_64.c
cmpxchg.c
common.c	x86, apic: remove duplicate asm/apic.h inclusions	2009-02-17 17:52:44 +01:00
cpu.h
cyrix.c
hypervisor.c	x86: hypervisor - fix sparse warnings	2008-11-23 11:11:52 +01:00
intel.c	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
intel_cacheinfo.c	Merge commit 'v2.6.29-rc4' into core/percpu	2009-02-09 14:58:11 +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	x86: fold apic_ops into genapic	2009-02-17 12:22:20 +01:00
powerflags.c
proc.c	x86: remove double copy of show_cpuinfo_core for 32 and 64 bit	2009-02-28 19:26:33 -08:00
transmeta.c
umc.c
vmware.c	x86: vmware - fix sparse warnings	2008-11-23 11:02:36 +01:00