Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ...

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-02-22 20:05:19 +01:00

..

k7.c

Update email addresses.

2008-10-20 12:50:03 -07:00

Makefile

x86: consolidate the cpu/ related code usage

2007-10-23 22:37:23 +02:00

mce_32.c

x86: update Alan Cox's email addresses

2009-01-05 15:19:16 +01:00

mce_64.c

x86, mce: remove incorrect __cpuinit for mce_cpu_features()

2009-02-20 23:40:40 -08:00

mce_amd_64.c

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

mce_intel_64.c

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

mce.h

x86: remove all definitions with fastcall

2008-01-30 13:31:17 +01:00

non-fatal.c

Update email addresses.

2008-10-20 12:50:03 -07:00

p4.c

x86, apic: remove genapic.h

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

p5.c

x86: update Alan Cox's email addresses

2009-01-05 15:19:16 +01:00

p6.c

x86: update Alan Cox's email addresses

2009-01-05 15:19:16 +01:00

therm_throt.c

sysdev: Pass the attribute to the low level sysdev show/store function

2008-07-21 21:55:02 -07:00

winchip.c

x86: update Alan Cox's email addresses

2009-01-05 15:19:16 +01:00