7aa2a165df
# Conflicts: # src/acpi/mod.rs # src/acpi/rsdt.rs # src/acpi/rxsdt.rs # src/acpi/srat/aarch64.rs # src/acpi/xsdt.rs # src/arch/x86_shared/start.rs # src/context/mod.rs # src/context/switch.rs # src/main.rs # src/memory/mod.rs # src/numa.rs # src/scheme/sys/mod.rs # src/startup/mod.rs