Merge branch 'fix/misc' into topic/misc

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

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

diff --cc sound/i2c/other/ak4xxx-adda.c
Simple merge

diff --cc sound/oss/soundcard.c
Simple merge

diff --cc sound/pci/oxygen/oxygen.c
Simple merge

diff --cc sound/pci/rme9652/hdsp.c
Simple merge