Merge branch 'master' of ssh://waterman@scm.millennium.berkeley.edu/project/cs/radlab...
authorAndrew Waterman <waterman@parcad.millennium.berkeley.edu>
Sat, 6 Feb 2010 23:38:14 +0000 (15:38 -0800)
committerAndrew Waterman <waterman@parcad.millennium.berkeley.edu>
Sat, 6 Feb 2010 23:38:14 +0000 (15:38 -0800)
1  2 
kern/src/env.c
kern/src/page_alloc.c

diff --cc kern/src/env.c
Simple merge
Simple merge