Merge branch 'topic/ca0106' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:35:58 +0000 (00:35 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:35:58 +0000 (00:35 +0100)
1  2 
sound/pci/ca0106/ca0106_main.c

Simple merge