Conflicts: arch/x86/kernel/setup.c arch/x86/platform/efi/efi.c arch/x86/platform/efi/efi_64.c |
||
---|---|---|
.. | ||
ce4100 | ||
efi | ||
geode | ||
goldfish | ||
intel-mid | ||
iris | ||
olpc | ||
scx200 | ||
sfi | ||
ts5500 | ||
uv | ||
visws | ||
Makefile |
Conflicts: arch/x86/kernel/setup.c arch/x86/platform/efi/efi.c arch/x86/platform/efi/efi_64.c |
||
---|---|---|
.. | ||
ce4100 | ||
efi | ||
geode | ||
goldfish | ||
intel-mid | ||
iris | ||
olpc | ||
scx200 | ||
sfi | ||
ts5500 | ||
uv | ||
visws | ||
Makefile |