Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 15 Jun 2016 07:54:54 +0000 (09:54 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 15 Jun 2016 07:54:54 +0000 (09:54 +0200)

Trivial merge