Merge branch 'topic/firewire' into for-next