Merge commit 'origin' into net-dev
authorKevin Klues <klueska@eecs.berkeley.edu>
Wed, 1 Jul 2009 21:08:27 +0000 (14:08 -0700)
committerKevin Klues <klueska@eecs.berkeley.edu>
Wed, 1 Jul 2009 21:08:27 +0000 (14:08 -0700)
commit5b467f07c38653103d8f8b330dfef6b1603e894a
tree22b49e13873778622514fef4c96480641200ab6d
parent1b76078c1b6c32e7171c0659b1ad3ebf19217739
parent502c4ee6a8fade6a1e8627b9c8bc66c37f8c5bcd
Merge commit 'origin' into net-dev

Conflicts:
include/ros/syscall.h
kern/src/Makefrag
kern/src/env.c
kern/src/manager.c
kern/src/syscall.c
include/ros/syscall.h
kern/src/Makefrag
kern/src/env.c
kern/src/smp.c
kern/src/syscall.c