git.barrelfish.org Git - barrelfish/commit

author	Simon Gerber <simon.gerber@inf.ethz.ch>
	Mon, 20 Oct 2014 12:19:15 +0000 (14:19 +0200)
committer	Simon Gerber <simon.gerber@inf.ethz.ch>
	Mon, 20 Oct 2014 12:19:15 +0000 (14:19 +0200)
commit	ff9708e2166a08482a5a9e81ebafb7fc60a0f965
tree	0b80c63e4c7f33ddfc758a8ef1a791546f2fd0e2	tree \| snapshot
parent	776b686eb01dc91bfa97dc7cbda4f569ab06075d	commit \| diff
parent	971d02b6e856be5e564e7344d09480213c2d390a	commit \| diff

Merge branch 'master' into master-into-distops

Conflicts:
errors/errno.fugu
include/barrelfish_kpi/sys_debug.h
kernel/arch/x86/start_aps.c
kernel/arch/x86_64/syscall.c
kernel/capabilities.c
lib/barrelfish/spawn_client.c
usr/monitor/main.c
usr/spawnd/service.c

37 files changed:

errors/errno.fugu	diff1 \|	diff2 \|	blob \| history
hake/Config.hs.template	diff1 \|	diff2 \|	blob \| history
include/barrelfish/core_state.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/debug.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/dispatch.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/domain.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/memobj.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/sys_debug.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/threads.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/waitset.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish_kpi/sys_debug.h	diff1 \|	diff2 \|	blob \| history
kernel/Hakefile	diff1 \|	diff2 \|	blob \| history
kernel/arch/armv7/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86/start_aps.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86/startup_x86.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/startup_arch.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/capabilities.c	diff1 \|	diff2 \|	blob \| history
kernel/dispatch.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/arch/arm/sys_debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/arch/x86_64/sys_debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/capabilities.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/event_queue.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/init.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/spawn_client.c	diff1 \|	diff2 \|	blob \| history
lib/mdb/mdb_tree.c	diff1 \|	diff2 \|	blob \| history
tools/asmoffsets/asmoffsets.c	diff1 \|	diff2 \|	blob \| history
tools/flounder/UMPCommon.hs	diff1 \|	diff2 \|	blob \| history
usr/kaluga/main.c	diff1 \|	diff2 \|	blob \| history
usr/mem_serv/mem_serv.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/Hakefile	diff1 \|	diff2 \|	blob \| history
usr/monitor/arch/x86/boot.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/main.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/spawn.c	diff1 \|	diff2 \|	blob \| history
usr/spawnd/service.c	diff1 \|	diff2 \|	blob \| history
usr/startd/main.c	diff1 \|	diff2 \|	blob \| history

Barrelfish OS git repo

RSS Atom

errors/errno.fugu	diff1 \|	diff2 \|	blob \| history
hake/Config.hs.template	diff1 \|	diff2 \|	blob \| history
include/barrelfish/core_state.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/debug.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/dispatch.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/domain.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/memobj.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/sys_debug.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/threads.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish/waitset.h	diff1 \|	diff2 \|	blob \| history
include/barrelfish_kpi/sys_debug.h	diff1 \|	diff2 \|	blob \| history
kernel/Hakefile	diff1 \|	diff2 \|	blob \| history
kernel/arch/armv7/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86/start_aps.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86/startup_x86.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/startup_arch.c	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/capabilities.c	diff1 \|	diff2 \|	blob \| history
kernel/dispatch.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/arch/arm/sys_debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/arch/x86_64/sys_debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/capabilities.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/debug.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/event_queue.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/init.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/spawn_client.c	diff1 \|	diff2 \|	blob \| history
lib/mdb/mdb_tree.c	diff1 \|	diff2 \|	blob \| history
tools/asmoffsets/asmoffsets.c	diff1 \|	diff2 \|	blob \| history
tools/flounder/UMPCommon.hs	diff1 \|	diff2 \|	blob \| history
usr/kaluga/main.c	diff1 \|	diff2 \|	blob \| history
usr/mem_serv/mem_serv.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/Hakefile	diff1 \|	diff2 \|	blob \| history
usr/monitor/arch/x86/boot.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/main.c	diff1 \|	diff2 \|	blob \| history
usr/monitor/spawn.c	diff1 \|	diff2 \|	blob \| history
usr/spawnd/service.c	diff1 \|	diff2 \|	blob \| history
usr/startd/main.c	diff1 \|	diff2 \|	blob \| history