diff options
author | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
commit | dccb915282854476ce47752df6631dcce3b8f661 (patch) | |
tree | a84aa8ed35618f99c3d7e8cdd466d22ae7bad597 /runoff.list | |
parent | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (diff) | |
parent | 13a96baefc0ff5d8262c4bc8c797bee4b157443c (diff) | |
download | xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.gz xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.bz2 xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.zip |
Merge commit 'origin/master' into page
Diffstat (limited to 'runoff.list')
-rw-r--r-- | runoff.list | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runoff.list b/runoff.list index 3258398..f0edaf0 100644 --- a/runoff.list +++ b/runoff.list @@ -22,8 +22,8 @@ proc.h proc.c swtch.S kalloc.c +data.S vm.c - # system calls traps.h vectors.pl @@ -46,11 +46,10 @@ file.c sysfile.c exec.c - - # pipes pipe.c + # string operations string.c @@ -65,6 +64,7 @@ kbd.c console.c timer.c uart.c +multiboot.S # user-level initcode.S @@ -73,3 +73,6 @@ init.c sh.c + + + |