Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 ... Conflicts: arch/parisc/kernel/irq.c arch/x86/include/asm/fixmap_64.h arch/x86/include/asm/setup.h kernel/irq/handle.c Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-03-27 17:28:43 +01:00
..
cpufreq	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
mcheck	Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core	2009-02-24 21:50:43 +01:00
mtrr	x86: tone down mtrr_trim_uncached_memory() warning	2009-01-29 11:45:35 +01:00
.gitignore
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_64.c
bugs.c
centaur_64.c
centaur.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_cacheinfo.c	Merge commit 'v2.6.29-rc4' into core/percpu	2009-02-09 14:58:11 +01:00
intel.c	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +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