Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 8 Dec 2014 10:33:24 +0000 (11:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 8 Dec 2014 10:33:24 +0000 (11:33 +0100)

Trivial merge