Merge branch 'test/pci-rename' into topic/misc

diff --cc sound/pci/ctxfi/cthw20k1.c
Simple merge

diff --cc sound/pci/ctxfi/cthw20k2.c
Simple merge

diff --cc sound/pci/ctxfi/xfi.c
Simple merge

diff --cc sound/pci/emu10k1/emu10k1_main.c
Simple merge

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