Merge http://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Mon, 6 Jun 2016 17:24:23 +0000 (13:24 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 6 Jun 2016 17:39:43 +0000 (13:39 -0400)
commitd77fa2ff766bbb4b867e791187f78b6033071613
treeb1116470884e46c0a66c49525771cf9b49c3835d
parent65eac4cc54921f9496061b0e0f0a7e159b42a3c6
parent086e13c5f6f79a68246d6b803cf4736cb6815e44
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
arch/arm/Kconfig
arch/arm/dts/Makefile
configs/odroid-xu3_defconfig
configs/peach-pi_defconfig
configs/peach-pit_defconfig
configs/smdk5420_defconfig
include/configs/exynos5-common.h
include/configs/smdk5420.h