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)
commitae552aa58b287321e24683ee85ad13faebdfaaf3
tree8e60783e3afcf7232710e7a924b451ac24485bc1
parent536909b556cc81b1b4e6c47dcf74a7719ee961d4
parentf4ba026de2c620ba9781c330fa46b2682ffa9488
Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish
include/barrelfish/memobj.h
kernel/arch/x86_64/page_mappings_arch.c