Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 16 Dec 2013 14:53:52 +0000 (15:53 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Dec 2013 14:53:52 +0000 (15:53 +0100)

Trivial merge