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)
commit4fcad2eaaacc0872f15669fc33f55646fd9d844a
tree975d264300cca78c974ff39439e30050d53f8c6a
parent9849fadfc07eeb2a3699f1ccb7b61f59d2c3c6b8
parent60c7e2d2edc7a2a3613540e18760a713359946f6
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