]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'clk-fixes' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Sat, 30 Jan 2016 01:26:31 +0000 (17:26 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 30 Jan 2016 01:26:31 +0000 (17:26 -0800)
* 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


Trivial merge