Merge tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Thu, 29 Jan 2015 21:58:33 +0000 (13:58 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 29 Jan 2015 21:58:33 +0000 (13:58 -0800)
commit467f7ad9f47c9da23c4c6c874a01fc22fd43b50f
tree1eacbed5f2ab406cc4a4dad4ad227a6c012ffa57
parent49d3f3ccf413b2b3b7581921c2dac48a50fdf234
parent30aca3c84bd79b48154908b6c1592347f4df3d53
Merge tag 'renesas-defconfig-fixes-for-v3.20' of git://git./linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Defconfig Fixes for v3.20" from Simon Horman:

* Select CONFIG_REGULATOR in mach_shmobile defconfig once again

* tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again

Signed-off-by: Olof Johansson <olof@lixom.net>