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)
commitcd80bc6f4811b48eb68716c8255bf7e5f0006caa
tree9b5f495d1bd33f4bbf3b23765188d3be72f38415
parentc4da29ca08e09ed41a2030c1f7b5860f116573be
parent6a12afb5640217454cad21e8cf9a74b038fa3717
Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_sigmatel.c
sound/pci/hda/patch_sigmatel.c