Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 24 Sep 2015 12:02:48 +0000 (14:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Sep 2015 12:02:48 +0000 (14:02 +0200)

Trivial merge