Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 9 Oct 2017 12:11:30 +0000 (14:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 9 Oct 2017 12:11:30 +0000 (14:11 +0200)

Trivial merge