Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 3 Jan 2017 10:39:30 +0000 (11:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 3 Jan 2017 10:39:30 +0000 (11:39 +0100)

Trivial merge