Merge with master

diff --cc devices/Hakefile
index 6ede515,c9d3a5f..91fc44e
--- 1/devices/Hakefile
--- 2/devices/Hakefile
+++ b/devices/Hakefile
@@@ -78,11 -78,12 +79,12 @@@
             "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",

diff --cc errors/errno.fugu
Simple merge

diff --cc hake/symbolic_targets.mk
Simple merge

diff --cc if/Hakefile
index ef71253,f1e27a7..eae8310
--- 1/if/Hakefile
--- 2/if/Hakefile
+++ b/if/Hakefile
@@@ -49,7 -49,8 +49,9 @@@
                 "serial",
                 "skb",
                 "skb_map",
 -               "octopus",               
 +               "octopus",
++               "octopus",
+                "omap_sdma",
                 "spawn",
                 "terminal",
                 "terminal_config",

diff --cc include/barrelfish/sys_debug.h
Simple merge

diff --cc include/barrelfish_kpi/sys_debug.h
Simple merge

diff --cc kernel/Hakefile
Simple merge

diff --cc kernel/arch/x86_64/entry.S
Simple merge

diff --cc kernel/arch/x86_64/page_mappings_arch.c
Simple merge

diff --cc usr/drivers/e1000/e1000n.c
Simple merge

diff --cc usr/skb/programs/device_db.pl
Simple merge