Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 12 Mar 2015 06:38:46 +0000 (07:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 12 Mar 2015 06:38:46 +0000 (07:38 +0100)

Trivial merge