Solved conflicts with ALSA CVS tree

diff --cc sound/isa/opl3sa2.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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