]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge remote-tracking branch 'roger/for-v3.17/gpmc-omap' into omap-for-v3.17/fixes...
authorTony Lindgren <tony@atomide.com>
Tue, 15 Jul 2014 07:24:39 +0000 (00:24 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Jul 2014 07:24:39 +0000 (00:24 -0700)

Trivial merge