Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
authorTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:42:55 +0000 (23:42 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:42:55 +0000 (23:42 +0100)
commit6a8436419d1b77b24d82bd90354adc4baa393566
treed20e17b148f37dc299658a60303e6a2e4e6ce63f
parent55fa518867978e1f5fd8353098f80d125ac734d7
parentff75427a7f641c4468610fbda2ccb69218174cd1
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
sound/pci/ca0106/ca0106_main.c