Merge branch 'topic/firewire-update' into for-next