diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-14 16:48:21 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-14 16:48:21 -0700 |
| commit | 9c861f33284cd77be3077cacc4c04303b3a60ebe (patch) | |
| tree | 7abdfba89c5856888b6c72e83b73e91ed37c5069 /block/scsi_ioctl.c | |
| parent | 7f274d54bb664519e62001a4782f5d5f2c95b06e (diff) | |
| parent | 949bdfed4b0f74215da60992e9f5e14c9ecbb064 (diff) | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
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: enable SUNXI_CCU_MP for PRCM
clk: sunxi-ng: v3s: Fix usb otg device reset bit
clk: sunxi-ng: a31: Correct lcd1-ch1 clock register offset
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions