Merge branch 'omap-for-v3.16/fixes'
authorTony Lindgren <tony@atomide.com>
Tue, 17 Jun 2014 08:48:29 +0000 (01:48 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 17 Jun 2014 08:48:29 +0000 (01:48 -0700)

Trivial merge