Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 Nov 2008 10:56:25 +0000 (11:56 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 Nov 2008 10:56:25 +0000 (11:56 +0100)
Conflicts:
sound/pci/hda/patch_sigmatel.c


Trivial merge