Merge branch 'omap-for-v5.8/dt-timer' into omap-for-v5.8/dt
authorTony Lindgren <tony@atomide.com>
Tue, 5 May 2020 18:09:38 +0000 (11:09 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 May 2020 18:09:38 +0000 (11:09 -0700)

Trivial merge