Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 30 Aug 2017 13:17:10 +0000 (15:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 30 Aug 2017 13:17:10 +0000 (15:17 +0200)

Trivial merge