Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Apr 2015 08:23:18 +0000 (10:23 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Apr 2015 08:23:18 +0000 (10:23 +0200)

Trivial merge