Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 1 Jul 2019 15:01:00 +0000 (17:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Jul 2019 15:01:55 +0000 (17:01 +0200)
commitb5c21c84705dbd96a0fff930d33022a17910b4f4
treea080aa4383c8f4ffb91225d234ac9b530b2ff0fa
parent7c2b3629d09ddec810dc4c1d3a6657c32def8f71
parent7fbd1753b64eafe21cf842348a40a691d0dee440
Merge branch 'for-linus' into for-next

This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/amdtp-am824.c
sound/firewire/fireface/ff-protocol-latter.c
sound/firewire/motu/motu-stream.c
sound/firewire/oxfw/oxfw.c
sound/pci/hda/hda_codec.c
sound/soc/sof/intel/hda.c