From: Stephen Boyd <sboyd@codeaurora.org>
Date: Sat, 30 Jan 2016 01:24:28 +0000 (-0800)
Subject: Merge tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~3764^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60c7e2d2edc7a2a3613540e18760a713359946f6;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v4.5-rockchip-clkfixes1' of git://git./linux/kernel/git/mmind/linux-rockchip into clk-fixes

Pull rockchip fixes from Heiko Stuebner:

Fixes for wrong register offsets in both rk3036 and rk3368.
Also rename the external input for the emac on rk3036, which
should still be ok to do, as that binding was only introduced
during this merge-window.

* tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: rk3368: fix some clock gates
  clk: rockchip: rk3036: rename emac ext source clock
  clk: rockchip: rk3036: fix the div offset for emac clock
  clk: rockchip: rk3036: fix uarts clock error
  clk: rockchip: rk3036: fix the FLAGs for clock mux
---

60c7e2d2edc7a2a3613540e18760a713359946f6