Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish
authorReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 13 Jan 2015 08:26:52 +0000 (09:26 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 13 Jan 2015 08:26:52 +0000 (09:26 +0100)
1  2 
include/barrelfish/memobj.h
kernel/arch/x86_64/page_mappings_arch.c

Simple merge