From: Olof Johansson Date: Thu, 29 Jan 2015 21:58:33 +0000 (-0800) Subject: Merge tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v4.0-rc1~67^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=467f7ad9f47c9da23c4c6c874a01fc22fd43b50f;p=linux.git Merge tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/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 --- 467f7ad9f47c9da23c4c6c874a01fc22fd43b50f