Merge branch 'master' into master-into-distops
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Thu, 19 Dec 2013 12:47:13 +0000 (13:47 +0100)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Thu, 19 Dec 2013 12:47:13 +0000 (13:47 +0100)
commit976b2c348fbdbde0a0b0c0a748c49f9c1a29b867
tree6b47656dc90afbf1fded76014d26e228c51e7021
parent97241117ec492520e06385e692186335712f0d12
parentdc9eef6e80f874145dde2f75953f10131e1fb4a8
Merge branch 'master' into master-into-distops
21 files changed:
errors/errno.fugu
hake/Config.hs.template
if/monitor_blocking.if
include/arch/x86_64/barrelfish/invocations_arch.h
include/barrelfish/caddr.h
include/barrelfish/core_state.h
include/barrelfish/waitset.h
include/barrelfish_kpi/capabilities.h
include/barrelfish_kpi/syscalls.h
kernel/Hakefile
kernel/arch/armv5/syscall.c
kernel/arch/x86_32/syscall.c
kernel/arch/x86_64/syscall.c
kernel/dispatch.c
kernel/syscall.c
lib/barrelfish/capabilities.c
lib/barrelfish/debug.c
lib/barrelfish/init.c
lib/mdb/mdb_tree.c
usr/monitor/Hakefile
usr/monitor/monitor_rpc_server.c