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
..
2009-02-22 20:05:19 +01:00
2009-02-15 12:50:08 +01:00
2009-01-07 21:44:20 +01:00
2007-12-17 19:28:17 -08:00
2009-01-15 16:39:39 -08:00
2008-10-22 21:53:49 -07:00
2008-07-25 22:12:41 +02:00
2009-01-07 21:44:20 +01:00
2009-01-07 21:44:20 +01:00
2008-04-25 20:18:48 +02:00
2008-04-25 20:18:48 +02:00