Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 00:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
6eec0152c4
linux/arch/x86/platform/sfi
History
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
sfi.c Merge branch 'linus' into x86/apic-cleanups 2011-01-07 14:14:15 +01:00