Merge branch 'post-10' into post-11

Author: phil-opp

Cargo.lock

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