forked from luck/tmp_suning_uos_patched
1c2a48cf65
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> |
||
---|---|---|
.. | ||
ce4100 | ||
efi | ||
iris | ||
mrst | ||
olpc | ||
scx200 | ||
sfi | ||
uv | ||
visws | ||
Makefile |