Merge branch 'fix/firewire' into for-linus