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)
commit2dde3bccbf905548a17b8d440053f86454af54a9
treee25ebd532def85307fc231710b6660c93565d55f
parent8f5951172b6dbda75a9cdf5990650e1cf8b1dd22
parent8bf9be566ed5790003402eb1060184956788b410
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
arch/arm/mach-omap2/gpmc.c