Adrian Danis e67be6acee Merge branch master into arm_hyp ... Conflicts: src/plat/exynos5/machine/hardware.c src/plat/tk1/machine/hardware.c		2016-06-08 15:04:03 +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	Merge branch master into arm_hyp	2016-06-08 15:04:03 +10:00