Merge remote-tracking branch 'origin/master' into shoal

Conflicts:
	kernel/arch/k1om/vmkit.c
	kernel/arch/x86_64/syscall.c
	usr/kaluga/start_cpu.c

diff --cc hake/symbolic_targets.mk
Simple merge

diff --cc kernel/arch/x86_64/syscall.c
index a00ef46,6f9b3b0..34ceedb
--- 1/kernel/arch/x86_64/syscall.c
--- 2/kernel/arch/x86_64/syscall.c
+++ b/kernel/arch/x86_64/syscall.c
@@@ -26,18 -25,17 +26,18 @@@
  #include <arch/x86/apic.h>
  #include <arch/x86/global.h>
  #include <arch/x86/perfmon.h>
 -#include <vmkit.h>
 -#include <barrelfish_kpi/sys_debug.h>
 -#include <barrelfish_kpi/lmp.h>
 -#include <barrelfish_kpi/dispatcher_shared_target.h>
  #include <arch/x86/debugregs.h>
 -#include <trace/trace.h>
  #include <arch/x86/syscall.h>
  #include <arch/x86/timing.h>
 -#include <fpu.h>
  #include <arch/x86/ipi_notify.h>
 +#include <barrelfish_kpi/sys_debug.h>
 +#include <barrelfish_kpi/lmp.h>
 +#include <barrelfish_kpi/dispatcher_shared_target.h>
 +#include <trace/trace.h>
 +#ifndef __k1om__
 +#include <vmkit.h>
- #include <amd_vmcb_dev.h>
+ #include <dev/amd_vmcb_dev.h>
 +#endif
  
  #define MIN(a,b)        ((a) < (b) ? (a) : (b))
  

diff --cc lib/vfs/vfs_fat.c
Simple merge

diff --cc usr/drivers/cpuboot/common.c
Simple merge