Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Nov 2013 09:10:02 +0000 (10:10 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 4 Nov 2013 09:10:02 +0000 (10:10 +0100)

Trivial merge