Merge branch 'topic/cs423x-merge' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:59 +0000 (00:35 +0100)]
1  2 
sound/isa/opl3sa2.c

Simple merge