Merge branch 'omap-for-v3.19/fixes-not-urgent' into omap-for-v3.19/fixes
authorTony Lindgren <tony@atomide.com>
Wed, 10 Dec 2014 16:25:50 +0000 (08:25 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Dec 2014 16:25:50 +0000 (08:25 -0800)

Trivial merge