Merge commit 'origin/page' into page

diff --cc runoff.list
index c469aae0ffbc0f9ec7826b514f159224d8f031b5,3258398868983f0df5e4ab61c64f00957744014c..f39ce189015eed79a0f77231b5b4a2f6366cbc76
--- 1/runoff.list
--- 2/runoff.list
+++ b/runoff.list
@@@ -21,8 -21,8 +21,9 @@@ spinlock.
  proc.h
  proc.c
  swtch.S
 +vm.c
  kalloc.c
+ vm.c
  
  # system calls
  traps.h