Merge pull request #1486 from antonio-nino-diaz-arm/an/psci-misra

author danh-arm <dan.handley@arm.com>

Wed, 25 Jul 2018 15:09:54 +0000 (16:09 +0100)

committer GitHub <noreply@github.com>

Wed, 25 Jul 2018 15:09:54 +0000 (16:09 +0100)
author danh-arm <dan.handley@arm.com>
Wed, 25 Jul 2018 15:09:54 +0000 (16:09 +0100)
committer GitHub <noreply@github.com>
Wed, 25 Jul 2018 15:09:54 +0000 (16:09 +0100)
diff --cc include/plat/arm/common/arm_def.h
Simple merge
diff --cc plat/arm/common/arm_pm.c
Simple merge
author	danh-arm <dan.handley@arm.com>
	Wed, 25 Jul 2018 15:09:54 +0000 (16:09 +0100)
committer	GitHub <noreply@github.com>
	Wed, 25 Jul 2018 15:09:54 +0000 (16:09 +0100)
		1	2
include/plat/arm/common/arm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/common/arm_pm.c	patch \|	diff1 \|	diff2 \|	blob \| history