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)
commit6bcdbd55b4c603d9741398d081133fcc50a10b6c
tree335e8d03b134030a748439993bb24d53004032a1
parent6a8436419d1b77b24d82bd90354adc4baa393566
parent72077aa336d0f4c5e3c7014d7471c79bc69873bb
Merge branch 'topic/ca0106-resume' into topic/ca0106
sound/pci/ca0106/ca0106.h
sound/pci/ca0106/ca0106_main.c