Merge branch 'for-4.2' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2015 14:42:45 +0000 (16:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2015 14:42:45 +0000 (16:42 +0200)

Trivial merge