Merge branch 'master' into proc-work
authorBarret Rhoden <brho@cs.berkeley.edu>
Tue, 4 Aug 2009 02:44:41 +0000 (19:44 -0700)
committerBarret Rhoden <brho@cs.berkeley.edu>
Tue, 4 Aug 2009 02:44:41 +0000 (19:44 -0700)
commitc4490a3eb747ed47f37191f52dae897b371d9ebc
treeefe197a193cbe83a9df02c828f360f2b8d7e6601
parentdb157479ed8599075f52e269b484d7f185334362
parente5370cc19775497b498c681ad5dd3c397d80a86a
Merge branch 'master' into proc-work

Conflicts:
kern/src/Makefrag
kern/src/manager.c
GNUmakefile
kern/arch/i386/atomic.h
kern/include/smp.h
kern/src/Makefrag
kern/src/env.c
kern/src/init.c
kern/src/kfs.c
kern/src/manager.c
kern/src/syscall.c
kern/src/testing.c