Adrian Danis b001bc4489 Merge branch 'master' into 'arm_hyp' ... Conflicts: Kconfig libsel4/tools/syscall_stub_gen.py src/plat/exynos5/machine/hardware.c src/plat/tk1/machine/Makefile src/plat/tk1/machine/hardware.c		2016-06-02 10:57:12 +10:00
..
api	SELFOUR-446 Unify code base for trace points and track feature	2016-06-02 10:49:25 +10:00
interfaces	x86: IOAPIC/MSI syscalls	2016-02-02 15:58:18 +11:00
sel4	arm/tk1: a checkpoint for SMMU implementation	2016-05-13 16:42:53 +10:00