Merge with master
authorStefan Kaestle <stefan.kaestle@inf.ethz.ch>
Wed, 20 Aug 2014 21:23:24 +0000 (23:23 +0200)
committerStefan Kaestle <stefan.kaestle@inf.ethz.ch>
Wed, 20 Aug 2014 21:23:24 +0000 (23:23 +0200)
1  2 
devices/Hakefile
errors/errno.fugu
hake/symbolic_targets.mk
if/Hakefile
include/barrelfish/sys_debug.h
include/barrelfish_kpi/sys_debug.h
kernel/Hakefile
kernel/arch/x86_64/entry.S
kernel/arch/x86_64/page_mappings_arch.c
usr/drivers/e1000/e1000n.c
usr/skb/programs/device_db.pl

             "omap/omap44xx_hsusbhost",
             "omap/omap44xx_id",
             "omap/omap44xx_l3init_cm2",
 -           "omap/omap44xx_l4per_cm2", 
 +           "omap/omap44xx_l4per_cm2",
             "omap/omap44xx_mmchs",
 -           "omap/omap44xx_mmchs1",           
 +           "omap/omap44xx_mmchs1",
             "omap/omap44xx_mmu",
             "omap/omap44xx_scrm",
+            "omap/omap44xx_sdma",
             "omap/omap44xx_spinlock",
             "omap/omap44xx_sysctrl_padconf_core",
             "omap/omap44xx_sysctrl_padconf_wkup",
Simple merge
Simple merge
diff --cc if/Hakefile
@@@ -49,7 -49,8 +49,9 @@@
                 "serial",
                 "skb",
                 "skb_map",
 -               "octopus",               
 +               "octopus",
++               "octopus",
+                "omap_sdma",
                 "spawn",
                 "terminal",
                 "terminal_config",
Simple merge
Simple merge
diff --cc kernel/Hakefile
Simple merge
Simple merge
Simple merge
Simple merge