git.barrelfish.org Git - barrelfish/commit

author	Simon Gerber <simon.gerber@inf.ethz.ch>
	Thu, 19 Dec 2013 12:47:13 +0000 (13:47 +0100)
committer	Simon Gerber <simon.gerber@inf.ethz.ch>
	Thu, 19 Dec 2013 12:47:13 +0000 (13:47 +0100)
commit	976b2c348fbdbde0a0b0c0a748c49f9c1a29b867
tree	6b47656dc90afbf1fded76014d26e228c51e7021	tree \| snapshot
parent	97241117ec492520e06385e692186335712f0d12	commit \| diff
parent	dc9eef6e80f874145dde2f75953f10131e1fb4a8	commit \| diff

Merge branch 'master' into master-into-distops

21 files changed:

errors/errno.fugu	diff1 \|	diff2 \|	blob \| history
hake/Config.hs.template	diff1 \|	diff2 \|	blob \| history
if/monitor_blocking.if	diff1 \|	diff2 \|	blob \| history
include/arch/x86_64/barrelfish/invocations_arch.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/caddr.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/core_state.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/waitset.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish_kpi/capabilities.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish_kpi/syscalls.h	diff1 \|	diff2 \|	blob \| history
kernel/Hakefile	diff1 \|	diff2 \|	blob \| history
kernel/arch/armv5/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_32/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/dispatch.c	diff1 \|	diff2 \|	blob \| history
kernel/syscall.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/capabilities.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/init.c	diff1 \|	diff2 \|	blob \| history
lib/mdb/mdb_tree.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/Hakefile	diff1 \|	diff2 \|	blob \| history
usr/monitor/monitor_rpc_server.c	diff1 \|	diff2 \|	blob \| history

Barrelfish OS git repo

errors/errno.fugu	diff1 \|	diff2 \|	blob \| history
hake/Config.hs.template	diff1 \|	diff2 \|	blob \| history
if/monitor_blocking.if	diff1 \|	diff2 \|	blob \| history
include/arch/x86_64/barrelfish/invocations_arch.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/caddr.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/core_state.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/waitset.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish_kpi/capabilities.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish_kpi/syscalls.h	diff1 \|	diff2 \|	blob \| history
kernel/Hakefile	diff1 \|	diff2 \|	blob \| history
kernel/arch/armv5/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_32/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/dispatch.c	diff1 \|	diff2 \|	blob \| history
kernel/syscall.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/capabilities.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/init.c	diff1 \|	diff2 \|	blob \| history
lib/mdb/mdb_tree.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/Hakefile	diff1 \|	diff2 \|	blob \| history
usr/monitor/monitor_rpc_server.c	diff1 \|	diff2 \|	blob \| history