Merge branch 'master' into master-into-distops
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Mon, 20 Oct 2014 12:19:15 +0000 (14:19 +0200)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Mon, 20 Oct 2014 12:19:15 +0000 (14:19 +0200)
commitff9708e2166a08482a5a9e81ebafb7fc60a0f965
tree0b80c63e4c7f33ddfc758a8ef1a791546f2fd0e2
parent776b686eb01dc91bfa97dc7cbda4f569ab06075d
parent971d02b6e856be5e564e7344d09480213c2d390a
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
hake/Config.hs.template
include/barrelfish/core_state.h
include/barrelfish/debug.h
include/barrelfish/dispatch.h
include/barrelfish/domain.h
include/barrelfish/memobj.h
include/barrelfish/sys_debug.h
include/barrelfish/threads.h
include/barrelfish/waitset.h
include/barrelfish_kpi/sys_debug.h
kernel/Hakefile
kernel/arch/armv7/syscall.c
kernel/arch/x86/start_aps.c
kernel/arch/x86/startup_x86.c
kernel/arch/x86_64/startup_arch.c
kernel/arch/x86_64/syscall.c
kernel/capabilities.c
kernel/dispatch.c
lib/barrelfish/arch/arm/sys_debug.c
lib/barrelfish/arch/x86_64/sys_debug.c
lib/barrelfish/capabilities.c
lib/barrelfish/debug.c
lib/barrelfish/event_queue.c
lib/barrelfish/init.c
lib/barrelfish/spawn_client.c
lib/mdb/mdb_tree.c
tools/asmoffsets/asmoffsets.c
tools/flounder/UMPCommon.hs
usr/kaluga/main.c
usr/mem_serv/mem_serv.c
usr/monitor/Hakefile
usr/monitor/arch/x86/boot.c
usr/monitor/main.c
usr/monitor/spawn.c
usr/spawnd/service.c
usr/startd/main.c