Merge pull request #1381 from antonio-nino-diaz-arm/an/kernel-boot

author Dimitris Papastamos <dimitris.papastamos@arm.com>

Wed, 16 May 2018 13:26:28 +0000 (14:26 +0100)

committer GitHub <noreply@github.com>

Wed, 16 May 2018 13:26:28 +0000 (14:26 +0100)
author Dimitris Papastamos <dimitris.papastamos@arm.com>
Wed, 16 May 2018 13:26:28 +0000 (14:26 +0100)
committer GitHub <noreply@github.com>
Wed, 16 May 2018 13:26:28 +0000 (14:26 +0100)
diff --cc docs/user-guide.rst
Simple merge
diff --cc plat/arm/common/arm_bl31_setup.c
Simple merge
diff --cc plat/arm/common/arm_common.mk
Simple merge
author	Dimitris Papastamos <dimitris.papastamos@arm.com>
	Wed, 16 May 2018 13:26:28 +0000 (14:26 +0100)
committer	GitHub <noreply@github.com>
	Wed, 16 May 2018 13:26:28 +0000 (14:26 +0100)
		1	2
docs/user-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/common/arm_bl31_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/common/arm_common.mk	patch \|	diff1 \|	diff2 \|	blob \| history