Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Jun 2018 09:41:48 +0000 (11:41 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 4 Jun 2018 09:42:27 +0000 (11:42 +0200)
4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Trivial merge