Merge branch 'topic/snd-device' into for-next

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

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc include/sound/compress_driver.h
Simple merge

diff --cc include/sound/pcm.h
Simple merge

diff --cc sound/aoa/soundbus/i2sbus/pcm.c
Simple merge

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

diff --cc sound/core/timer.c
Simple merge

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