Merge branch 'master' of git://git.denx.de/u-boot-atmel

diff --cc drivers/clk/Kconfig
index 7dd56738b06abee1a58014e59fbe5c341a34ea93,3da63c0dd14662c3f12f612d4bb4349033c826b9..8f3b96a97362268a346e6da11a74adeb82c3c479
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -20,8 -20,8 +20,9 @@@ config SPL_CL
          setting up clocks within SPL, and allows the same drivers to be
          used as U-Boot proper.
  
 +source "drivers/clk/tegra/Kconfig"
  source "drivers/clk/uniphier/Kconfig"
  source "drivers/clk/exynos/Kconfig"
+ source "drivers/clk/at91/Kconfig"
  
  endmenu

diff --cc drivers/clk/Makefile
index 463b1d647dc6b1ab68ac2442ed6580fd00da2a49,65de0082b4a48fcc163f8422b3abb0522cacb26e..778d7486f066c9934e47e62817499914b9ccb120
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -10,7 -10,6 +10,8 @@@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip
  obj-$(CONFIG_SANDBOX) += clk_sandbox.o
  obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o
  obj-$(CONFIG_MACH_PIC32) += clk_pic32.o
 +
 +obj-y += tegra/
  obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
  obj-$(CONFIG_CLK_EXYNOS) += exynos/
+ obj-$(CONFIG_CLK_AT91) += at91/

diff --cc drivers/i2c/Kconfig
Simple merge

diff --cc drivers/i2c/Makefile
Simple merge