Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 31 Mar 2014 10:16:31 +0000 (12:16 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 31 Mar 2014 10:16:31 +0000 (12:16 +0200)

Trivial merge