Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 27 Nov 2015 12:41:11 +0000 (13:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 27 Nov 2015 12:41:11 +0000 (13:41 +0100)

Trivial merge