Merge branch 'topic/timer-api' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 5 Oct 2017 13:08:57 +0000 (15:08 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 5 Oct 2017 13:08:57 +0000 (15:08 +0200)

Trivial merge