Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Sat, 15 Nov 2008 18:05:21 +0000 (19:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 15 Nov 2008 18:05:21 +0000 (19:05 +0100)
commite2da9ba570418fb4061f0a5cfe4338be6470c02b
treeabdee28e90a5a911d0762286d729ea7f7d3cb65b
parent127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f
parentc39555d6edd0142972f577405d5259879ecc1635
Merge branch 'topic/fix/hda' into topic/hda

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