Merge tag 'omap-for-v3.20/defconfig-modular' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 20 Jan 2015 18:19:17 +0000 (10:19 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 20 Jan 2015 18:19:17 +0000 (10:19 -0800)
Defconfig changes for omap2plus_defconfig to make it more modular,
and to add few more drivers found on various boards.

Conflicts:
arch/arm/configs/omap2plus_defconfig


Trivial merge