Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 16 Apr 2018 11:48:05 +0000 (13:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Apr 2018 11:48:17 +0000 (13:48 +0200)
Merge the pending 4.17 fixes into the devel branch for 4.18.

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

Trivial merge