Merge remote-tracking branch 'clk/clk-next'

Conflicts:
	Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

diff --cc Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index b5fc72621bfd1e8fbd74795693b5b07f3e2ca0cc,30df825d72efa71525c1bf419dddfed39a474488..8a92b5fb3540f33a2d55806b948c3e4c7e269374
--- 1/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
--- 2/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@@ -10,7 -10,7 +10,8 @@@ index in the group, from 0 to 31
  Required Properties:
  
    - compatible: Must be one of the following
 +    - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks
+     - "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks
      - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks
      - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks
      - "renesas,cpg-mstp-clock" for generic MSTP gate clocks

diff --cc drivers/clk/Makefile
Simple merge