Merge remote-tracking branch 'clk/clk-next'

Conflicts:
	drivers/clk/tegra/clk-tegra114.c

diff --cc Documentation/devicetree/bindings/clock/silabs,si5351.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-tegra/common.c
Simple merge

diff --cc drivers/clk/Makefile
Simple merge

diff --cc drivers/clk/clk-si5351.c
Simple merge

diff --cc drivers/clk/clk-vt8500.c
Simple merge

diff --cc drivers/clk/clk.c
Simple merge

diff --cc drivers/clk/tegra/clk-tegra114.c
index 40d939d091bfc69608ea2a959cacef2cd87531a3,7fe36eaa993b6fe95b6c0856028041ffa166288d..dbd04283158e8c8ff33e22cba84d0ff468bd3eda
--- 1/drivers/clk/tegra/clk-tegra114.c
--- 2/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@@ -250,9 -251,10 +251,13 @@@
  #define CLK_SOURCE_XUSB_DEV_SRC 0x60c
  #define CLK_SOURCE_EMC 0x19c
  
 +/* Tegra CPU clock and reset control regs */
 +#define CLK_RST_CONTROLLER_CPU_CMPLX_STATUS   0x470
 +
+ /* PLLM override registers */
+ #define PMC_PLLM_WB0_OVERRIDE 0x1dc
+ #define PMC_PLLM_WB0_OVERRIDE_2 0x2b0
+ 
  static int periph_clk_enb_refcnt[CLK_OUT_ENB_NUM * 32];
  
  static void __iomem *clk_base;

diff --cc drivers/clk/tegra/clk-tegra30.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge

diff --cc drivers/mfd/dbx500-prcmu-regs.h
Simple merge