Merge tag 'clk-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/clk...

Pull clock framework updates from Michael Turquette:
 "The changes to the common clock framework for 4.2 are dominated by new
  drivers and updates to existing ones, as usual.

  There are some fixes to the framework itself and several cleanups for
  sparse warnings, etc"

* tag 'clk-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (135 commits)
  clk: stm32: Add clock driver for STM32F4[23]xxx devices
  dt-bindings: Document the STM32F4 clock bindings
  cpufreq: exynos: remove Exynos4210 specific cpufreq driver support
  ARM: Exynos: switch to using generic cpufreq driver for Exynos4210
  clk: samsung: exynos4: add cpu clock configuration data and instantiate cpu clock
  clk: samsung: add infrastructure to register cpu clocks
  clk: add CLK_RECALC_NEW_RATES clock flag for Exynos cpu clock support
  doc: dt: add documentation for lpc1850-ccu clk driver
  clk: add lpc18xx ccu clk driver
  doc: dt: add documentation for lpc1850-cgu clk driver
  clk: add lpc18xx cgu clk driver
  clk: keystone: add support for post divider register for main pll
  clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED
  clk: cygnus: remove Cygnus dummy clock binding
  clk: cygnus: add clock support for Broadcom Cygnus
  clk: Change bcm clocks build dependency
  clk: iproc: add initial common clock support
  clk: iproc: define Broadcom iProc clock binding
  MAINTAINERS: update email for Michael Turquette
  clk: meson: add some error handling in meson_clk_register_cpu()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-exynos/exynos.c
Simple merge

diff --cc drivers/clk/Makefile
index 8732e4c5bf3c131678ec7ee97f9b6e98c2663a39,fc789a07cb5fac0f42b2940b7700f4f059045dfb..c4cf075a2320f7ae33327fd79e9d9525c15921c0
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -45,14 -47,11 +47,13 @@@ obj-$(CONFIG_COMMON_CLK_WM831X)            += clk
  obj-$(CONFIG_COMMON_CLK_XGENE)                += clk-xgene.o
  obj-$(CONFIG_COMMON_CLK_PWM)          += clk-pwm.o
  obj-$(CONFIG_COMMON_CLK_AT91)         += at91/
- obj-$(CONFIG_ARCH_BCM_MOBILE)         += bcm/
+ obj-$(CONFIG_ARCH_BCM)                        += bcm/
  obj-$(CONFIG_ARCH_BERLIN)             += berlin/
- obj-$(CONFIG_ARCH_HI3xxx)             += hisilicon/
- obj-$(CONFIG_ARCH_HIP04)              += hisilicon/
- obj-$(CONFIG_ARCH_HIX5HD2)            += hisilicon/
+ obj-$(CONFIG_ARCH_HISI)                       += hisilicon/
 +obj-$(CONFIG_ARCH_MXC)                        += imx/
 +obj-$(CONFIG_MACH_INGENIC)            += ingenic/
  obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
+ obj-$(CONFIG_ARCH_MEDIATEK)           += mediatek/
  ifeq ($(CONFIG_COMMON_CLK), y)
  obj-$(CONFIG_ARCH_MMP)                        += mmp/
  endif

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge