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

..

Makefile

x86: Move sfi to platform

2010-10-27 14:30:01 +02:00

sfi.c

Merge branch 'linus' into x86/apic-cleanups

2011-01-07 14:14:15 +01:00