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

diff --cc drivers/gpu/drm/i915/intel_audio.c
Simple merge

diff --cc drivers/spi/spi-atmel.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw-stream.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw.h
Simple merge