Merge branch 'lwip-next': new lwip-2 network stack
authorAdam Turowski <adam.turowski@inf.ethz.ch>
Thu, 1 Jun 2017 10:33:04 +0000 (12:33 +0200)
committerAdam Turowski <adam.turowski@inf.ethz.ch>
Thu, 1 Jun 2017 10:33:04 +0000 (12:33 +0200)
Signed-off-by: Adam Turowski <adam.turowski@inf.ethz.ch>

1  2 
errors/errno.fugu
if/Hakefile
lib/net_interfaces/interface_raw.c
platforms/Hakefile
usr/drivers/e10k/Hakefile

Simple merge
diff --cc if/Hakefile
@@@ -93,8 -93,7 +93,9 @@@
                 "sfn5122f",
                 "sfn5122f_devif",
                 "descq",
 +               "ddomain",
-                "dcontrol"
++               "dcontrol",
+                "net_filter"
             ],
               arch <- allArchitectures
  ] ++
Simple merge
Simple merge
Simple merge