Merge branch 'omap-for-v3.19/gpmc' into omap-for-v3.19/tmp-merge-2014-11-04
authorTony Lindgren <tony@atomide.com>
Tue, 4 Nov 2014 16:58:42 +0000 (08:58 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Nov 2014 16:58:42 +0000 (08:58 -0800)

Trivial merge