]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 Nov 2008 14:20:57 +0000 (15:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 Nov 2008 14:20:57 +0000 (15:20 +0100)
Conflicts:
sound/pci/hda/patch_sigmatel.c

1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/hda/patch_sigmatel.c

Simple merge