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
..
2008-07-08 17:55:41 +02:00
2008-07-08 17:55:41 +02:00
2009-02-18 15:37:56 -08:00
2005-07-13 11:56:32 -07:00