]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a881bc c861667)
Merge branch 'clk-fixes' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 16 Nov 2016 19:15:58 +0000 (11:15 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 16 Nov 2016 19:15:58 +0000 (11:15 -0800)
* clk-fixes:
  clk: efm32gg: Pass correct type to hw provider registration
  clk: berlin: Pass correct type to hw provider registration
  clk: sunxi: Fix M factor computation for APB1
  clk: sunxi-ng: sun6i-a31: Force AHB1 clock to use PLL6 as parent


Trivial merge
local clone of linux.git