H. Peter Anvin 48b1fddbb1 Merge branch 'irq/numa' into x86/mce3 ...

Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2009-06-01 15:25:31 -07:00

..

cpufreq

acpi-cpufreq: fix printk typo and indentation

2009-05-29 21:26:26 -04:00

mcheck

x86, mce: trivial clean up for mce-inject.c

2009-05-28 09:24:16 -07:00

mtrr

x86: mtrr: Fix high_width computation when phys-addr is >= 44bit

2009-05-11 11:40:43 +02:00

.gitignore

Update .gitignore files for generated targets

2008-10-20 11:24:31 -07:00

addon_cpuid_features.c

x86 ACPI: Add support for Always Running APIC timer

2009-04-07 18:17:51 -04:00

amd.c

x86: don't call read_apic_id if !cpu_has_apic

2009-05-18 08:43:25 +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

x86: fdiv bug detection fix

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

centaur.c

x86/centaur: merge 32 & 64 bit version

2009-03-14 16:27:29 +01:00

cmpxchg.c

x86: move cmpxchg fallbacks to a generic place

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

common.c

Merge branch 'x86/cpufeature' into irq/numa

2009-06-01 22:30:01 +02:00

cpu_debug.c

x86: display extended apic registers with print_local_APIC and cpu_debug code

2009-05-11 14:37:36 +02:00

cpu.h

x86: cpu/cpu.h cleanup

2009-03-23 02:06:51 +05:30

cyrix.c

x86: move various CPU initialization objects into .cpuinit.rodata

2009-03-12 13:13:07 +01:00

hypervisor.c

x86: hypervisor - fix sparse warnings

2008-11-23 11:11:52 +01:00

intel_cacheinfo.c

Merge branch 'linus' into cpumask-for-linus

2009-03-30 23:53:32 +02:00

intel.c

x86: don't call read_apic_id if !cpu_has_apic

2009-05-18 08:43:25 +02:00

Makefile

x86/centaur: merge 32 & 64 bit version

2009-03-14 16:27:29 +01: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: show number of core_siblings instead of thread_siblings in /proc/cpuinfo

2009-05-04 20:36:49 +02:00

transmeta.c

x86: move various CPU initialization objects into .cpuinit.rodata

2009-03-12 13:13:07 +01:00

umc.c

x86: move various CPU initialization objects into .cpuinit.rodata

2009-03-12 13:13:07 +01:00

vmware.c

x86: vmware - fix sparse warnings

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