Merge branch 'omap-for-v3.20/defconfig' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2015 01:03:41 +0000 (17:03 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2015 01:03:41 +0000 (17:03 -0800)
Conflicts:
arch/arm/configs/omap2plus_defconfig


Trivial merge