Merge pull request #1751 from vwadekar/tegra-scatter-file-support

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

Fri, 1 Mar 2019 11:23:58 +0000 (11:23 +0000)

committer GitHub <noreply@github.com>

Fri, 1 Mar 2019 11:23:58 +0000 (11:23 +0000)
author Antonio Niño Díaz <antonio.ninodiaz@arm.com>
Fri, 1 Mar 2019 11:23:58 +0000 (11:23 +0000)
committer GitHub <noreply@github.com>
Fri, 1 Mar 2019 11:23:58 +0000 (11:23 +0000)
diff --cc Makefile
Simple merge
diff --cc docs/user-guide.rst
Simple merge
diff --cc include/common/bl_common.h
Simple merge
diff --cc include/lib/el3_runtime/pubsub.h
Simple merge
author	Antonio Niño Díaz <antonio.ninodiaz@arm.com>
	Fri, 1 Mar 2019 11:23:58 +0000 (11:23 +0000)
committer	GitHub <noreply@github.com>
	Fri, 1 Mar 2019 11:23:58 +0000 (11:23 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history
include/common/bl_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/lib/el3_runtime/pubsub.h	patch \|	diff1 \|	diff2 \|	blob \| history