Merge commit 'd6e7bbc148f9fbec8a0117b0d0f420c9710e6d81' into omap-for-v4.21/dt-ti...
authorTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2018 16:47:50 +0000 (09:47 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2018 16:47:50 +0000 (09:47 -0700)

Trivial merge