923a789b49
Conflicts: arch/x86/kernel/reboot.c |
||
---|---|---|
.. | ||
amd.c | ||
centaur.c | ||
cyrix.c | ||
generic.c | ||
if.c | ||
main.c | ||
Makefile | ||
mtrr.h | ||
state.c |
923a789b49
Conflicts: arch/x86/kernel/reboot.c |
||
---|---|---|
.. | ||
amd.c | ||
centaur.c | ||
cyrix.c | ||
generic.c | ||
if.c | ||
main.c | ||
Makefile | ||
mtrr.h | ||
state.c |