From: Michael Turquette <mturquette@baylibre.com>
Date: Wed, 2 Mar 2016 00:23:40 +0000 (-0800)
Subject: Merge branch 'clk-ti' into clk-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95;p=linux-beck.git

Merge branch 'clk-ti' into clk-next

Conflicts:
	drivers/clk/Kconfig
---

3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95
diff --cc drivers/clk/Kconfig
index 15f548ad0207,5bf16ccc010b..16f7d33421d8
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -199,9 -202,12 +199,10 @@@ config COMMON_CLK_PX
  
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
 +source "drivers/clk/mvebu/Kconfig"
  source "drivers/clk/qcom/Kconfig"
 +source "drivers/clk/samsung/Kconfig"
 +source "drivers/clk/tegra/Kconfig"
+ source "drivers/clk/ti/Kconfig"
  
  endmenu
 -
 -source "drivers/clk/mvebu/Kconfig"
 -
 -source "drivers/clk/samsung/Kconfig"
 -source "drivers/clk/tegra/Kconfig"