Merge branch 'omap-for-v4.12/dt-droid4-v2' into omap-for-v4.12/dt-v2
authorTony Lindgren <tony@atomide.com>
Tue, 28 Mar 2017 21:00:55 +0000 (14:00 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Mar 2017 21:00:55 +0000 (14:00 -0700)

Trivial merge