Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 11 Aug 2015 07:40:16 +0000 (09:40 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 11 Aug 2015 07:40:16 +0000 (09:40 +0200)

Trivial merge