Merge branch 'for-linus' into for-next

Back-merge the development process for catching up the HD-audio fix
(and apply a new one on top of that).

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/firewire/bebob/bebob_stream.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/soc/sof/intel/Kconfig
Simple merge