Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 20 Jan 2014 09:20:14 +0000 (10:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 20 Jan 2014 09:20:14 +0000 (10:20 +0100)

Trivial merge