From: Stephen Boyd Date: Wed, 16 Nov 2016 19:15:58 +0000 (-0800) Subject: Merge branch 'clk-fixes' into clk-next X-Git-Tag: v4.10-rc1~161^2~33 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=977f0ab0581d61b2b46cc08857818c425cd24f55;p=linux.git Merge branch 'clk-fixes' into clk-next * 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 --- 977f0ab0581d61b2b46cc08857818c425cd24f55