Merge pull request #219 from jcastillo-arm/jc/tf-issues/253

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

Tue, 4 Nov 2014 16:01:40 +0000 (16:01 +0000)

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

Tue, 4 Nov 2014 16:01:40 +0000 (16:01 +0000)
author danh-arm <dan.handley@arm.com>
Tue, 4 Nov 2014 16:01:40 +0000 (16:01 +0000)
committer danh-arm <dan.handley@arm.com>
Tue, 4 Nov 2014 16:01:40 +0000 (16:01 +0000)
diff --cc plat/juno/aarch64/juno_common.c
Simple merge
diff --cc plat/juno/juno_private.h
Simple merge
diff --cc plat/juno/plat_pm.c
Simple merge
diff --cc plat/juno/platform.mk
Simple merge
author	danh-arm <dan.handley@arm.com>
	Tue, 4 Nov 2014 16:01:40 +0000 (16:01 +0000)
committer	danh-arm <dan.handley@arm.com>
	Tue, 4 Nov 2014 16:01:40 +0000 (16:01 +0000)
		1	2
plat/juno/aarch64/juno_common.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/juno/juno_private.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/juno/plat_pm.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/juno/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history