Merge "feat(rng-trap): add EL3 support for FEAT_RNG_TRAP" into integration

author Bipin Ravi <bipin.ravi@arm.com>

Thu, 18 Aug 2022 20:24:41 +0000 (22:24 +0200)

committer TrustedFirmware Code Review <review@review.trustedfirmware.org>

Thu, 18 Aug 2022 20:24:41 +0000 (22:24 +0200)
author Bipin Ravi <bipin.ravi@arm.com>
Thu, 18 Aug 2022 20:24:41 +0000 (22:24 +0200)
committer TrustedFirmware Code Review <review@review.trustedfirmware.org>
Thu, 18 Aug 2022 20:24:41 +0000 (22:24 +0200)
diff --cc Makefile
Simple merge
diff --cc docs/getting_started/build-options.rst
Simple merge
diff --cc make_helpers/defaults.mk
Simple merge
author	Bipin Ravi <bipin.ravi@arm.com>
	Thu, 18 Aug 2022 20:24:41 +0000 (22:24 +0200)
committer	TrustedFirmware Code Review <review@review.trustedfirmware.org>
	Thu, 18 Aug 2022 20:24:41 +0000 (22:24 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/getting_started/build-options.rst	patch \|	diff1 \|	diff2 \|	blob \| history
make_helpers/defaults.mk	patch \|	diff1 \|	diff2 \|	blob \| history