Merge pull request #1224 from masahir0y/gzip

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

Tue, 6 Feb 2018 05:12:28 +0000 (05:12 +0000)

committer GitHub <noreply@github.com>

Tue, 6 Feb 2018 05:12:28 +0000 (05:12 +0000)
author davidcunado-arm <david.cunado@arm.com>
Tue, 6 Feb 2018 05:12:28 +0000 (05:12 +0000)
committer GitHub <noreply@github.com>
Tue, 6 Feb 2018 05:12:28 +0000 (05:12 +0000)
diff --cc Makefile
Simple merge
diff --cc plat/hisilicon/hikey/platform.mk
Simple merge
diff --cc plat/socionext/uniphier/uniphier_bl2_setup.c
Simple merge
author	davidcunado-arm <david.cunado@arm.com>
	Tue, 6 Feb 2018 05:12:28 +0000 (05:12 +0000)
committer	GitHub <noreply@github.com>
	Tue, 6 Feb 2018 05:12:28 +0000 (05:12 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
plat/hisilicon/hikey/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history
plat/socionext/uniphier/uniphier_bl2_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history