Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish...
authorReto Achermann <reto.achermann@inf.ethz.ch>
Thu, 27 Nov 2014 09:10:57 +0000 (10:10 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Thu, 27 Nov 2014 09:10:57 +0000 (10:10 +0100)
commit5804ba172af23e507451eceb134ae58837e9dcb4
treecea82481dc6cfcce01b2594b4c827a429d531330
parentb3fdca1e51158aee4fd9d4fbb521d1cd54ce4729
parent2fde92565122f67d2b07ba02a2f7d82e83e0071a
Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish into shoal

Conflicts:
usr/drivers/cpuboot/main.c
hake/symbolic_targets.mk
usr/drivers/cpuboot/main.c
usr/drivers/xeon_phi/domain.c