From: Olof Johansson <olof@lixom.net>
Date: Mon, 7 Jul 2014 00:10:12 +0000 (-0700)
Subject: Merge tag 'renesas-defconfig-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.17-rc1~75^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dcead42437d79c3a760b56eabf349a71cf3117c0;p=karo-tx-linux.git

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
---

dcead42437d79c3a760b56eabf349a71cf3117c0