diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-04-21 19:19:46 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-04-21 19:19:46 -0700 |
| commit | de000a88c159268e6bf8ac9c06de7d0a5f19f644 (patch) | |
| tree | adf8912e65e7f784a32d118823842713dd1ae41c /drivers/ide/ide-cd_ioctl.c | |
| parent | b68adc23bc3d0c81a08b69cf1ba0bf0405c9d868 (diff) | |
| parent | 7149c1becddf49022fe0aad2fa395377cd8f753e (diff) | |
Merge tag 'sunxi-clk-for-4.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into HEAD
Pull Allwinner clock changes, take 2 from Maxime Ripard:
A few minor bug and comment fixes, plus some fixes for the PRCM CCU driver
merged in the prior pull request
* tag 'sunxi-clk-for-4.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
clk: sunxi-ng: a80: Fix audio PLL comment not matching actual code
clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch
clk: sunxi-ng: use 1 as fallback for minimum multiplier
clk: sunxi-ng: fix PRCM CCU CLK_NUMBER value
clk: sunxi-ng: fix PRCM CCU ir clk parent
Diffstat (limited to 'drivers/ide/ide-cd_ioctl.c')
0 files changed, 0 insertions, 0 deletions