Merge pull request #918 from rockchip-linux/rk3328

author davidcunado-arm <david.cunado@arm.com>

Wed, 10 May 2017 11:48:38 +0000 (12:48 +0100)

committer GitHub <noreply@github.com>

Wed, 10 May 2017 11:48:38 +0000 (12:48 +0100)
author davidcunado-arm <david.cunado@arm.com>
Wed, 10 May 2017 11:48:38 +0000 (12:48 +0100)
committer GitHub <noreply@github.com>
Wed, 10 May 2017 11:48:38 +0000 (12:48 +0100)
diff --cc plat/rockchip/common/bl31_plat_setup.c
Simple merge
diff --cc plat/rockchip/common/drivers/pmu/pmu_com.h
Simple merge
diff --cc plat/rockchip/common/plat_pm.c
Simple merge
author	davidcunado-arm <david.cunado@arm.com>
	Wed, 10 May 2017 11:48:38 +0000 (12:48 +0100)
committer	GitHub <noreply@github.com>
	Wed, 10 May 2017 11:48:38 +0000 (12:48 +0100)
		1	2
plat/rockchip/common/bl31_plat_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/rockchip/common/drivers/pmu/pmu_com.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/rockchip/common/plat_pm.c	patch \|	diff1 \|	diff2 \|	blob \| history