Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Aug 2014 09:11:22 +0000 (11:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 4 Aug 2014 09:11:22 +0000 (11:11 +0200)

Trivial merge