Ingo Molnar 1c2a48cf65 Merge branch 'linus' into x86/apic-cleanups ... Conflicts: arch/x86/include/asm/io_apic.h Merge reason: Resolve the conflict, update to a more recent -rc base Signed-off-by: Ingo Molnar <mingo@elte.hu>		2011-01-07 14:14:15 +01:00
..
ce4100	ce4100: Add errata fixes for UART on CE4100	2010-12-06 15:58:26 +01:00
efi	x86: Move efi to platform	2010-10-27 14:30:01 +02:00
iris	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00
mrst	x86: Unify 3 similar ways of saving mp_irqs info	2010-12-09 21:52:06 +01:00
olpc	x86: Move olpc to platform	2010-10-27 17:22:16 +02:00
scx200	x86: Move scx200 to platform	2010-10-27 14:30:01 +02:00
sfi	Merge branch 'linus' into x86/apic-cleanups	2011-01-07 14:14:15 +01:00
uv	x86, UV, BAU: Extend for more than 16 cpus per socket	2011-01-03 20:35:03 +01:00
visws	x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion	2011-01-05 14:09:23 +01:00
Makefile	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00