diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-20 05:02:29 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-20 05:02:29 +0200 |
commit | 9705596d08ac87c18aee32cc97f2783b7d14624e (patch) | |
tree | 34ac05e4e29db94c8c7aeaa89966a9de39c7bbcd /block/blk-wbt.c | |
parent | Merge tag 'ntb-4.12-bugfixes' of git://github.com/jonmason/ntb (diff) | |
parent | Merge tag 'sunxi-clk-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/... (diff) | |
download | linux-9705596d08ac87c18aee32cc97f2783b7d14624e.tar.xz linux-9705596d08ac87c18aee32cc97f2783b7d14624e.zip |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"One build fix for an Amlogic clk driver and a handful of Allwinner clk
driver fixes for some DT bindings and a randconfig build error that
all came in this merge window"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: sunxi-ng: a64: Export PLL_PERIPH0 clock for the PRCM
clk: sunxi-ng: h3: Export PLL_PERIPH0 clock for the PRCM
dt-bindings: clock: sunxi-ccu: Add pll-periph to PRCM's needed clocks
clk: sunxi-ng: sun5i: Fix ahb_bist_clk definition
clk: sunxi-ng: enable SUNXI_CCU_MP for PRCM
clk: meson: gxbb: fix build error without RESET_CONTROLLER
clk: sunxi-ng: v3s: Fix usb otg device reset bit
clk: sunxi-ng: a31: Correct lcd1-ch1 clock register offset
Diffstat (limited to 'block/blk-wbt.c')
0 files changed, 0 insertions, 0 deletions