Adrian Danis 22623be2f8 Merge branch master into arm_hyp ... Conflicts: include/arch/arm/arch/32/mode/object/structures.h libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h src/arch/arm/32/model/statedata.c		2016-02-22 15:55:31 +11:00
..
arm	Correct previous merge	2016-02-02 15:00:05 +11:00
x86	x86/libsel4: Rename ia32->x86	2016-02-10 16:50:49 +11:00