Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Fri, 21 Nov 2008 07:27:04 +0000 (08:27 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Nov 2008 07:27:04 +0000 (08:27 +0100)
commit75a287d9a35a825cb758d2f8d8df93d41f9f8e3e
tree7aacf881315a16695e35ca810434e42666d26a55
parent1725b82a6e2721612a3572d0336f51f1f1c3cf54
parent3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0
Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_sigmatel.c
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/hda/patch_sigmatel.c