Merge branch 'omap-for-v4.10/fixes' into omap-for-v4.11/fixes
authorTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2017 15:45:36 +0000 (07:45 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2017 15:45:36 +0000 (07:45 -0800)

Trivial merge