Merge branch 'omap-for-v.16/dmtimer-fix' into omap-for-v4.17/timer
authorTony Lindgren <tony@atomide.com>
Thu, 22 Feb 2018 18:46:47 +0000 (10:46 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 22 Feb 2018 18:46:47 +0000 (10:46 -0800)

Trivial merge