Merge tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "Second Round of Renesas ARM Based SoC Board Updates for v3.15" from
Simon Horman:

* r7s72100 (RZ/A1H) based Genmai board
  - Enable SH ethernet
  - Add RSPI support

* r8a7791 (R-Car M2) based Koelsch board
  - Add QSPI support
  - Add I2C support
  - Pass SH ethernet PHY IRQ

* r8a7790 (R-Car H2) based Lager board
  - Switch QSPI to named IRQs
  - Add sound support
  - Add USB0 cable detection workaround
  - Pass SH ethernet PHY IRQ

* r8a7779 (R-Car H1) based Marzen board
  - Revert conditional selection of SMSC_PHY

* r8a7778 (R-Car M1) based Bock-W board
  - Use wp-gpios instead of WP pin

* tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: genmai: Enable r7s72100-ether
  ARM: shmobile: lager legacy: Switch QSPI to named IRQs
  ARM: shmobile: koelsch legacy: Add QSPI support
  ARM: shmobile: genmai legacy: Add RSPI support
  Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY"
  ARM: shmobile: lager: add sound support
  ARM: shmobile: Lager USB0 cable detection workaround
  ARM: shmobile: bockw: use wp-gpios instead of WP pin
  ARM: shmobile: koelsch: Add I2C support
  ARM: shmobile: Koelsch: pass Ether PHY IRQ
  ARM: shmobile: Lager: pass Ether PHY IRQ

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge