Merge pull request #1804 from antonio-nino-diaz-arm/an/cleanup

author Antonio Niño Díaz <antonio.ninodiaz@arm.com>

Tue, 5 Feb 2019 11:31:15 +0000 (11:31 +0000)

committer GitHub <noreply@github.com>

Tue, 5 Feb 2019 11:31:15 +0000 (11:31 +0000)
author Antonio Niño Díaz <antonio.ninodiaz@arm.com>
Tue, 5 Feb 2019 11:31:15 +0000 (11:31 +0000)
committer GitHub <noreply@github.com>
Tue, 5 Feb 2019 11:31:15 +0000 (11:31 +0000)
diff --cc docs/porting-guide.rst
Simple merge
diff --cc include/common/bl_common.h
Simple merge
diff --cc plat/hisilicon/hikey960/hikey960_bl31_setup.c
Simple merge
author	Antonio Niño Díaz <antonio.ninodiaz@arm.com>
	Tue, 5 Feb 2019 11:31:15 +0000 (11:31 +0000)
committer	GitHub <noreply@github.com>
	Tue, 5 Feb 2019 11:31:15 +0000 (11:31 +0000)
		1	2
docs/porting-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history
include/common/bl_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/hisilicon/hikey960/hikey960_bl31_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history