Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19...
authorTony Lindgren <tony@atomide.com>
Tue, 4 Nov 2014 01:45:36 +0000 (17:45 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Nov 2014 01:45:36 +0000 (17:45 -0800)
Conflicts:
arch/arm/mach-omap2/gpmc.c


Trivial merge