Merge branch 'omap-for-v4.12/dt-droid4-v2' into omap-for-v4.12/dt-v2
authorTony Lindgren <tony@atomide.com>
Sun, 9 Apr 2017 23:35:51 +0000 (16:35 -0700)
committerTony Lindgren <tony@atomide.com>
Sun, 9 Apr 2017 23:35:51 +0000 (16:35 -0700)

Trivial merge