]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'topic/pcsp-fix' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:39:47 +0000 (23:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:39:47 +0000 (23:39 +0100)
1  2 
sound/pci/mixart/mixart.c
sound/pci/pcxhr/pcxhr.c

Simple merge
Simple merge