From: Stephen Boyd <sboyd@codeaurora.org>
Date: Sat, 30 Jan 2016 01:26:31 +0000 (-0800)
Subject: Merge branch 'clk-fixes' into clk-next
X-Git-Tag: android-x86-7.1-r1~1817^2~115
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4fcad2eaaacc0872f15669fc33f55646fd9d844a;p=android-x86%2Fkernel.git

Merge branch 'clk-fixes' into clk-next

* clk-fixes:
  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
---

4fcad2eaaacc0872f15669fc33f55646fd9d844a