Merge tag 'renesas-kconfig-cleanups-for-v3.18' of git://git.kernel.org/pub/scm/linux...

Merge tag 'renesas-kconfig-cleanups-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/cleanup

Pull "Renesas ARM Based SoC Kconfig Cleanups for v3.18" from Simon Horman:

* Update name of "R-Car M2-W" SoC (previously there was no "-W")
* Consolidate Legacy SH_CLK_CPG and CPU_V7 Kconfig
* Only select PM_RMOBILE for legacy case
* Cleanup pm-rcar.o and pm-rmobile.o build using Kconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-kconfig-cleanups-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791 is now called "R-Car M2-W"
  ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig
  ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig
  ARM: shmobile: Only select PM_RMOBILE for legacy case
  ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig
  ARM: shmobile: Cleanup pm-rcar.o build using Kconfig
  ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2
  ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1
  ARM: shmobile: Introduce a Kconfig entry for R-Mobile

Includes an update to 3.17-rc2 to avoid a dependency