Merge branch 'topic/ca0106-resume' into topic/ca0106
authorTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:43:00 +0000 (23:43 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:43:00 +0000 (23:43 +0100)
1  2 
sound/pci/ca0106/ca0106.h
sound/pci/ca0106/ca0106_main.c

Simple merge
Simple merge