Merge branch 'omap-for-v3.14/fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 21 Feb 2014 23:46:51 +0000 (15:46 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 21 Feb 2014 23:46:51 +0000 (15:46 -0800)

Trivial merge