From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Nov 2014 01:45:36 +0000 (-0800)
Subject: Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19... 
X-Git-Tag: omap-for-v3.19/gpmc-timings~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dde3bccbf905548a17b8d440053f86454af54a9;p=pandora-kernel.git

Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc

Conflicts:
	arch/arm/mach-omap2/gpmc.c
---

2dde3bccbf905548a17b8d440053f86454af54a9
Reading git-diff-tree failed