From: Tony Lindgren <tony@atomide.com>
Date: Tue, 20 Jan 2015 18:19:17 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.20/defconfig-modular' into for-next
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5235e1823aac83014fd21ae3f6c6fb00a7c9d65;p=pandora-kernel.git

Merge tag 'omap-for-v3.20/defconfig-modular' into for-next

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
---

c5235e1823aac83014fd21ae3f6c6fb00a7c9d65
Reading git-diff-tree failed