Merge branch 'topic/pci-cleanup' into for-next

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

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

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

diff --cc sound/pci/cs46xx/cs46xx_lib.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc sound/pci/trident/trident_main.c
Simple merge

diff --cc sound/pci/ymfpci/ymfpci_main.c
Simple merge