Merge pull request #259 from soby-mathew/sm/plat_max_afflvl

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

Wed, 25 Feb 2015 17:54:41 +0000 (09:54 -0800)

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

Wed, 25 Feb 2015 17:54:41 +0000 (09:54 -0800)
author danh-arm <dan.handley@arm.com>
Wed, 25 Feb 2015 17:54:41 +0000 (09:54 -0800)
committer danh-arm <dan.handley@arm.com>
Wed, 25 Feb 2015 17:54:41 +0000 (09:54 -0800)
diff --cc plat/fvp/include/platform_def.h
Simple merge
diff --cc plat/juno/include/platform_def.h
Simple merge
author	danh-arm <dan.handley@arm.com>
	Wed, 25 Feb 2015 17:54:41 +0000 (09:54 -0800)
committer	danh-arm <dan.handley@arm.com>
	Wed, 25 Feb 2015 17:54:41 +0000 (09:54 -0800)
		1	2
plat/fvp/include/platform_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/juno/include/platform_def.h	patch \|	diff1 \|	diff2 \|	blob \| history