Merge branch 'omap-for-v3.15/fixes-v2' into omap-for-v3.16/tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 6 May 2014 18:49:30 +0000 (11:49 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 6 May 2014 18:49:30 +0000 (11:49 -0700)

Trivial merge