Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Thu, 13 Nov 2008 13:38:00 +0000 (14:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 13 Nov 2008 13:38:00 +0000 (14:38 +0100)
Conflicts:
sound/pci/hda/patch_sigmatel.c


Trivial merge