Fix arrakis merge errors
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Fri, 14 Aug 2015 07:16:19 +0000 (09:16 +0200)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Fri, 14 Aug 2015 07:16:19 +0000 (09:16 +0200)
commit42ff64e3f079022fa20dc02787e38ca35b2ea317
tree79783b147a6b3e21697a8e6f749a51a45918b56f
parentbebc5f3780da1d60e8af5dd826aed90785ad2ad8
Fix arrakis merge errors

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>
include/barrelfish_kpi/capabilities.h
kernel/arch/x86_64/syscall.c