Merge branch 'fix/firewire' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 26 Nov 2013 17:37:40 +0000 (18:37 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 26 Nov 2013 17:37:40 +0000 (18:37 +0100)

Trivial merge