From: Olof Johansson Date: Fri, 23 Jan 2015 21:46:55 +0000 (-0800) Subject: Merge tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.15~16309^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce9aead6386c7393fdc5a0dbbe1741936eb5dd8d;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'omap-for-v3.20/defconfig-modular' of git://git./linux/kernel/git/tmlind/linux-omap into next/defconfig Merge "omap defconfig changes for v3.20" from Tony Lindgren: Defconfig changes for omap2plus_defconfig to make it more modular, and to add few more drivers found on various boards. * tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform ARM: omap2plus_defconfig: Enable pcf857x ARM: omap2plus_defconfig: Add NOR flash support ARM: omap2plus_defconfig: Enable support for davinci_emac ARM: omap2plus_defconfig: enable TPS65218 power button ARM: omap2plus_defconfig: reduce zImage size on omap2plus_defconfig Signed-off-by: Olof Johansson --- ce9aead6386c7393fdc5a0dbbe1741936eb5dd8d