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)
commit0e19e7d2bff0ec04fe4dc920c580d8a321afa07f
tree9e784e7556a92172a0b27465e0b081437e44335e
parent82894b6f6f109722070d4d78730fe50cdaba9443
parentf73d35853e9263c7c404f0d6c0fe3d83fc6fd5c0
Merge branch 'topic/fix/hda' into topic/hda

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