From: Tony Lindgren <tony@atomide.com>
Date: Thu, 8 Jan 2015 01:03:41 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.20/defconfig' into for-next
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99e7d84d810ffdad6f305828681fd4e2fe05d0c;p=pandora-kernel.git

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

Conflicts:
	arch/arm/configs/omap2plus_defconfig
---

c99e7d84d810ffdad6f305828681fd4e2fe05d0c
Reading git-diff-tree failed