Merge branch 'master' into device-queue
authorRoni Häcki <roni.haecki@inf.ethz.ch>
Fri, 2 Sep 2016 07:20:39 +0000 (09:20 +0200)
committerRoni Häcki <roni.haecki@inf.ethz.ch>
Fri, 2 Sep 2016 07:20:39 +0000 (09:20 +0200)
commitb8fc6ef8eb22381940eee5d8f2a4e828d76752da
tree565554c42eded301ac974a88c0c27f78e2c3b87a
parent978e050065d9342241f67fe16e1b9800f7cb32f7
parent6d756bb8db12989df6322d87847a3e18709ea958
Merge branch 'master' into device-queue

Signed-off-by: Roni Häcki <roni.haecki@inf.ethz.ch>

Conflicts:
hake/K1om.hs
if/Hakefile
tools/harness/tests/common.py
tools/harness/tests/coreboottest.py
errors/errno.fugu
hake/Config.hs.template
hake/Tools.hs
if/Hakefile
tools/harness/tests/common.py
tools/harness/tests/coreboottest.py