From: Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local>
Date: Thu, 26 Aug 2010 12:03:18 +0000 (-0400)
Subject: Merge commit 'origin/page' into page
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=d55b2fac074ac23e30c337014f40ae2156b31b60;p=cs3210-lab1.git

Merge commit 'origin/page' into page
---

d55b2fac074ac23e30c337014f40ae2156b31b60
diff --cc runoff.list
index c469aae,3258398..f39ce18
--- a/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