From: Olof Johansson Date: Sun, 29 Dec 2013 21:24:02 +0000 (-0800) Subject: Merge tag 'renesas-defconfig2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15~18591^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8708138951b08441f4e18e75a2d012750261f0c0;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'renesas-defconfig2-for-v3.14' of git://git./linux/kernel/git/horms/renesas into next/boards From Simon Horman: Second Round of Renesas ARM Based SoC Defconfig Updates for v3.14 * r7s72100 SoC (RZ/A1H) based Genmai Board - Fixup I2C device on defconfig - Add gpio regulator support on defconfig * r8a7791 (R-Car M2) based Koelsch board - Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig - Enable CONFIG_PACKET in defconfig - Enable Ether in defconfig * r8a7740 (R-Mobile A1) based Armadillo board - Enable backlight control in defconfig * r8a7740 (R-Mobile A1) based Armadillo board - Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY * tag 'renesas-defconfig2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: koelsch: Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig ARM: shmobile: koelsch: Enable CONFIG_PACKET in defconfig ARM: shmobile: armadillo800eva: Enable backlight control in defconfig ARM: shmobile: Koelsch: enable Ether in defconfig ARM: shmobile: genmai: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY ARM: shmobile: lager: fixup I2C device on defconfig ARM: shmobile: lager: add gpio regulator support on defconfig Signed-off-by: Olof Johansson --- 8708138951b08441f4e18e75a2d012750261f0c0