From: Tony Lindgren <tony@atomide.com>
Date: Mon, 19 Jan 2015 21:24:18 +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=3ae3dc45ee7d81a95efa71bcc8c062523ddd7be0;p=pandora-kernel.git

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

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

3ae3dc45ee7d81a95efa71bcc8c062523ddd7be0
Reading git-diff-tree failed