Merge branch 'master' of hg.systems.ethz.ch:barrelfish
authorGerd Zellweger <mail@gerdzellweger.com>
Thu, 20 Nov 2014 08:23:33 +0000 (09:23 +0100)
committerGerd Zellweger <mail@gerdzellweger.com>
Thu, 20 Nov 2014 08:23:33 +0000 (09:23 +0100)
commit3f03a8c5595b1ebd1adae55132b68f9e012e3624
tree09389bfa543a6d74b5ba6318d33dd997b1b6a2c1
parentab03240a25ba51c01cb422766a0976baac521faa
parent0098db9e3f5cb16db4bec707b060c2876c4332c7
Merge branch 'master' of hg.systems.ethz.ch:barrelfish

Conflicts:
kernel/arch/x86/start_aps.c
hake/symbolic_targets.mk
include/barrelfish_kpi/init.h
kernel/startup.c
lib/spawndomain/spawn.c
usr/pci/pci_msix.c