Merge https://source.denx.de/u-boot/custodians/u-boot-samsung

diff --cc arch/arm/Kconfig
Simple merge

diff --cc configs/arndale_defconfig
Simple merge

diff --cc configs/odroid-xu3_defconfig
Simple merge

diff --cc configs/peach-pi_defconfig
Simple merge

diff --cc configs/peach-pit_defconfig
Simple merge

diff --cc configs/smdk5250_defconfig
Simple merge

diff --cc configs/smdk5420_defconfig
Simple merge

diff --cc configs/smdkv310_defconfig
index fcc655c,6b738b4..ac84fde
--- 1/configs/smdkv310_defconfig
--- 2/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@@ -28,5 -28,5 +28,4 @@@ CONFIG_MMC_SDHCI_SDMA=
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_MTD=y
  CONFIG_SMC911X=y
- CONFIG_SMC911X_BASE=0x5000000
  CONFIG_USB=y
 -CONFIG_DM_USB=y

diff --cc configs/snow_defconfig
Simple merge

diff --cc configs/spring_defconfig
Simple merge

diff --cc lib/fdtdec.c
Simple merge