Merge branch 'master' into arm_coreboot
authorDavid Cock <david.cock@inf.ethz.ch>
Tue, 30 Aug 2016 13:07:17 +0000 (15:07 +0200)
committerDavid Cock <david.cock@inf.ethz.ch>
Tue, 30 Aug 2016 13:07:17 +0000 (15:07 +0200)
commitc9ae86bbc11d578034caed226aeb794b4e6a1ba8
tree450f313583c7a9c188013d54f6f1a0d6e8b491f5
parenta35f636b2b4f3441d260bc4f517b43ac99c75f97
parent495481d52dfbee80c81760f97e186827f47919db
Merge branch 'master' into arm_coreboot

Signed-off-by: David Cock <david.cock@inf.ethz.ch>

Conflicts:
include/arch/arm/barrelfish/invocations_arch.h
12 files changed:
include/arch/arm/barrelfish/invocations_arch.h
include/arch/arm/barrelfish/syscall_arch.h
include/barrelfish_kpi/capabilities.h
kernel/Hakefile
kernel/arch/arm/irq.c
kernel/arch/arm/misc.c
kernel/arch/armv7/startup_arch.c
kernel/arch/armv7/syscall.c
kernel/include/arch/armv7/exceptions.h
platforms/Hakefile
tools/asmoffsets/asmoffsets.c
usr/drivers/cpuboot/armboot.c