Merge remote branch 'origin/page' into page

This commit is contained in:
Robert Morris 2010-08-30 10:23:27 -04:00
commit 979c5686b7
2 changed files with 2 additions and 0 deletions

View file

@ -21,6 +21,7 @@ spinlock.c
proc.h proc.h
proc.c proc.c
swtch.S swtch.S
vm.c
kalloc.c kalloc.c
vm.c vm.c

View file

@ -27,6 +27,7 @@ even: proc.h # mild preference
right: proc.c # VERY important right: proc.c # VERY important
# setjmp.S either # setjmp.S either
# vm.c either
# kalloc.c either # kalloc.c either
# syscall.h either # syscall.h either