Merge "fix(pmu): unconditionally save PMCR_EL0" into integration

author Manish Pandey <manish.pandey2@arm.com>

Wed, 10 May 2023 12:12:25 +0000 (14:12 +0200)

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

Wed, 10 May 2023 12:12:25 +0000 (14:12 +0200)
author Manish Pandey <manish.pandey2@arm.com>
Wed, 10 May 2023 12:12:25 +0000 (14:12 +0200)
committer TrustedFirmware Code Review <review@review.trustedfirmware.org>
Wed, 10 May 2023 12:12:25 +0000 (14:12 +0200)
diff --cc bl31/aarch64/ea_delegate.S
Simple merge
diff --cc bl31/aarch64/runtime_exceptions.S
Simple merge
diff --cc lib/el3_runtime/aarch64/context.S
Simple merge
author	Manish Pandey <manish.pandey2@arm.com>
	Wed, 10 May 2023 12:12:25 +0000 (14:12 +0200)
committer	TrustedFirmware Code Review <review@review.trustedfirmware.org>
	Wed, 10 May 2023 12:12:25 +0000 (14:12 +0200)
		1	2
bl31/aarch64/ea_delegate.S	patch \|	diff1 \|	diff2 \|	blob \| history
bl31/aarch64/runtime_exceptions.S	patch \|	diff1 \|	diff2 \|	blob \| history
lib/el3_runtime/aarch64/context.S	patch \|	diff1 \|	diff2 \|	blob \| history