Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 6 Jan 2016 09:20:41 +0000 (10:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 6 Jan 2016 09:20:41 +0000 (10:20 +0100)

Trivial merge