Merge branch 'omap-gpmc-for-v3.10-take2' of git://github.com/jonhunter/linux into...
authorTony Lindgren <tony@atomide.com>
Thu, 4 Apr 2013 18:22:33 +0000 (11:22 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 4 Apr 2013 18:22:33 +0000 (11:22 -0700)

Trivial merge