Merge pull request #885 from antonio-nino-diaz-arm/an/console-flush

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

Wed, 12 Apr 2017 21:23:44 +0000 (22:23 +0100)

committer GitHub <noreply@github.com>

Wed, 12 Apr 2017 21:23:44 +0000 (22:23 +0100)
author davidcunado-arm <david.cunado@arm.com>
Wed, 12 Apr 2017 21:23:44 +0000 (22:23 +0100)
committer GitHub <noreply@github.com>
Wed, 12 Apr 2017 21:23:44 +0000 (22:23 +0100)
diff --cc docs/porting-guide.md
Simple merge
diff --cc include/plat/common/platform.h
Simple merge
author	davidcunado-arm <david.cunado@arm.com>
	Wed, 12 Apr 2017 21:23:44 +0000 (22:23 +0100)
committer	GitHub <noreply@github.com>
	Wed, 12 Apr 2017 21:23:44 +0000 (22:23 +0100)
		1	2
docs/porting-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/common/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history