From: Olof Johansson Date: Fri, 3 Apr 2015 17:49:51 +0000 (-0700) Subject: Merge tag 'v4.1-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind... X-Git-Tag: v4.1-rc1~47^2~11 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=342f346af11dbe9b05466ecaeb8d853cfd06327d;p=linux.git Merge tag 'v4.1-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig Merge "omap defconfig changes for v4.1" from Tony Lindgren: Few omap2plus_defconfig updates to add commonly used drivers as loadable modules. Note that I'll do patches for armv7_defconfig for these at some point too once we're happy with omap2plus_defconfig to avoid extra churn on the defconfig files. * tag 'v4.1-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Enable n900 modem as loadable modules ARM: omap2plus_defconfig: Update bluetooth options ARM: omap2plus_defconfig: Enable leds-pwm ARM: omap1_defconfig: drop obsolete Kconfig symbols arm: config: omap2plus_defconfig: switch over to LZMA compression ARM: omap2plus_defconfig: Enable EXTCON_GPIO_USB Signed-off-by: Olof Johansson --- 342f346af11dbe9b05466ecaeb8d853cfd06327d