tree b1116470884e46c0a66c49525771cf9b49c3835d
parent 65eac4cc54921f9496061b0e0f0a7e159b42a3c6
parent 086e13c5f6f79a68246d6b803cf4736cb6815e44
author Tom Rini <trini@konsulko.com> 1465233863 -0400
committer Tom Rini <trini@konsulko.com> 1465234783 -0400

Merge http://git.denx.de/u-boot-samsung

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	configs/peach-pi_defconfig
	configs/peach-pit_defconfig