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

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_64.c

x86: move bugs_64.c to cpu/bugs_64.c

2008-06-03 14:43:00 -07:00

bugs.c

x86: fdiv bug detection fix

2008-07-31 23:56:27 +02:00

centaur_64.c

x86: centaur_64.c remove duplicated setting of CONSTANT_TSC

2008-09-10 08:21:06 +02:00

centaur.c

x86: move mtrr cpu cap setting early in early_init_xxxx

2008-09-06 17:50:55 +02:00

cmpxchg.c

x86: move cmpxchg fallbacks to a generic place

2008-08-18 16:05:47 +02:00

common.c

x86, apic: remove duplicate asm/apic.h inclusions

2009-02-17 17:52:44 +01:00

cpu.h

x86: remove duplicated get_model_name() calling

2008-09-06 14:09:12 +02:00

cyrix.c

x86: move mtrr cpu cap setting early in early_init_xxxx

2008-09-06 17:50:55 +02:00

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

x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>

2008-08-27 19:23:22 -07:00

perfctr-watchdog.c

x86: fold apic_ops into genapic

2009-02-17 12:22:20 +01:00

powerflags.c

x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>

2008-08-27 19:23:22 -07:00

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

x86: move transmeta cap read to early_init_transmeta()

2008-09-14 14:09:14 +02:00

umc.c

x86: remove cpu_vendor_dev

2008-09-04 21:09:45 +02:00

vmware.c

x86: vmware - fix sparse warnings

2008-11-23 11:02:36 +01:00