Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 5 Jan 2014 10:19:34 +0000 (11:19 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 5 Jan 2014 10:19:34 +0000 (11:19 +0100)

Trivial merge