From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Aug 2013 17:00:18 +0000 (-0700)
Subject: Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
X-Git-Tag: upstream/snapshot3+hdmi~4545
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull clock controller fixes from Michael Turquette:
 "Two small fixes for the Zynq clock controller introduced in 3.11-rc1
  and another Exynos clock patch which fixes a regression that prevents
  the video pipeline from functioning on that platform"

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
  clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes
  clk/zynq/clkc: Add dedicated spinlock for the SWDT
---

0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a