Merge tag 'renesas-defconfig-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Merge "Renesas ARM Based SoC Defconfig Updates for v3.17" from Simon Horman:
* Enable Marzen board and r8a7779 SoC, CPUFREQ and PM_RUNTIME in
shmobile (multiplatform) defconfig
* Enable LED support in armadillo800eva defconfig
* tag 'renesas-defconfig-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable CPUFREQ configuration
ARM: shmobile: Enable PM_RUNTIME in defconfig
ARM: shmobile: marzen: Add to shmobile defconfig
ARM: shmobile: armadillo800eva defconfig: Enable REGULATOR_GPIO and LEDS_GPIO