Merge tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux

Pull clock framework changes from Mike Turquette:
 "The clock framework changes for 3.15 look similar to past pull
  requests.  Mostly clock driver updates, more Device Tree support in
  the form of common functions useful across platforms and a handful of
  features and fixes to the framework core"

* tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
  clk: shmobile: fix setting paretn clock rate
  clk: shmobile: rcar-gen2: fix lb/sd0/sd1/sdh clock parent to pll1
  clk: Fix minor errors in of_clk_init() function comments
  clk: reverse default clk provider initialization order in of_clk_init()
  clk: sirf: update copyright years to 2014
  clk: mmp: try to use closer one when do round rate
  clk: mmp: fix the wrong calculation formula
  clk: mmp: fix wrong mask when calculate denominator
  clk: st: Adds quadfs clock binding
  clk: st: Adds clockgen-vcc and clockgen-mux clock binding
  clk: st: Adds clockgen clock binding
  clk: st: Adds divmux and prediv clock binding
  clk: st: Support for A9 MUX clocks
  clk: st: Support for ClockGenA9/DDR/GPU
  clk: st: Support for QUADFS inside ClockGenB/C/D/E/F
  clk: st: Support for VCC-mux and MUX clocks
  clk: st: Support for PLLs inside ClockGenA(s)
  clk: st: Support for DIVMUX and PreDiv Clocks
  clk: support hardware-specific debugfs entries
  clk: s2mps11: Use of_get_child_by_name
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/socfpga.dtsi
Simple merge

diff --cc drivers/clk/Kconfig
Simple merge

diff --cc drivers/clk/Makefile
index 88af4a399d6c30a91fbd581920354a257c201ecc,85a33e6d765c29bcb84dd3e3d9203ef2ff13ab70..5f8a28735c9661acdec4d5631899b12dc59f97c4
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -29,8 -30,8 +30,9 @@@ obj-$(CONFIG_ARCH_VT8500)             += clk-vt850
  obj-$(CONFIG_COMMON_CLK_WM831X)               += clk-wm831x.o
  obj-$(CONFIG_COMMON_CLK_XGENE)                += clk-xgene.o
  obj-$(CONFIG_COMMON_CLK_AT91)         += at91/
 +obj-$(CONFIG_ARCH_BCM_MOBILE)         += bcm/
  obj-$(CONFIG_ARCH_HI3xxx)             += hisilicon/
+ obj-$(CONFIG_ARCH_HIP04)              += hisilicon/
  obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
  ifeq ($(CONFIG_COMMON_CLK), y)
  obj-$(CONFIG_ARCH_MMP)                        += mmp/

diff --cc drivers/clk/shmobile/clk-rcar-gen2.c
Simple merge

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