linux-next: manual merge of the clk tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the clk tree got conflicts in:

  arch/arm/boot/dts/r8a7779.dtsi
  arch/arm/boot/dts/r8a7790.dtsi
  arch/arm/boot/dts/r8a7791.dtsi
  arch/arm/boot/dts/r8a7792.dtsi
  arch/arm/boot/dts/r8a7793.dtsi
  arch/arm/boot/dts/r8a7794.dtsi
  arch/arm/mach-shmobile/setup-rcar-gen2.c
  arch/arm64/boot/dts/renesas/r8a7795.dtsi
  arch/arm64/boot/dts/renesas/r8a7796.dtsi
  drivers/soc/renesas/Makefile

between various commits from the arm-soc tree and commits from the
clk tree.

It was just too much at this time of day, so please talk to each other
and figure out how to fix these up.  I have used the clk tree from
next-20161117 for today.

-- 
Cheers,
Stephen Rothwell