Merge branch 'post-11' into post-12

This commit is contained in:
Philipp Oppermann
2020-05-20 14:31:12 +02:00
4 changed files with 22 additions and 14 deletions

View File

@@ -16,7 +16,7 @@ harness = false
bootloader = { version = "0.9.3", features = ["map_physical_memory"]}
volatile = "0.2.6"
spin = "0.5.2"
x86_64 = "0.9.6"
x86_64 = "0.11.0"
uart_16550 = "0.2.0"
pic8259_simple = "0.1.1"
pc-keyboard = "0.5.0"