Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git

diff --cc sound/core/seq/seq_clientmgr.c
Simple merge

diff --cc sound/pci/hda/Kconfig
Simple merge

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

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

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

diff --cc sound/soc/codecs/hdmi-codec.c
Simple merge

diff --cc sound/usb/midi.c
Simple merge

diff --cc sound/usb/mixer_quirks.c
Simple merge

diff --cc sound/usb/quirks.c
Simple merge