You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		14 years ago
..
Makefile	x86: Move sfi to platform	15 years ago
sfi.c	Merge branch 'linus' into x86/apic-cleanups	14 years ago