Merge branch 'omap-for-v3.20/fixes-not-urgent' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2015 02:03:51 +0000 (18:03 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2015 02:03:51 +0000 (18:03 -0800)

Trivial merge