Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 30 Oct 2013 16:40:54 +0000 (17:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 30 Oct 2013 16:40:54 +0000 (17:40 +0100)

Trivial merge