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)
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

1  2 
errors/errno.fugu
hake/Config.hs.template
hake/Tools.hs
if/Hakefile
tools/harness/tests/common.py
tools/harness/tests/coreboottest.py

Simple merge
Simple merge
diff --cc hake/Tools.hs
Simple merge
diff --cc if/Hakefile
                 "xmplrpc",
                 "xmplthc",
                 "xomp",
-                "xomp_gateway",
-                "unixsock",
-                "bcache",
-                "replay",
-                "xeon_phi_driver",
-                "xeon_phi_manager",
-                "xeon_phi",
-                "virtio",
-                "block_service",
-                "bulk_ctrl",
-                "arrakis",
-                "e10k_vf",
-                "flounderbootstrap",
-                "empty",
-                  "subways",
 +               "devif"
+                "xomp_gateway"
             ],
               arch <- allArchitectures
  ] ++
Simple merge
Simple merge