Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 Nov 2008 14:20:57 +0000 (15:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 Nov 2008 14:20:57 +0000 (15:20 +0100)
commiteefe93b9957e6f14780b7d37aeda0f27f341953d
tree4b73293616abc911ead9d559a58b897885d7ad86
parentee09543c866559e1ffb4f5c38533f2bedd725acd
parent661cd8fb5210af78f0763071642e0764a10389a6
Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_sigmatel.c
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/hda/patch_sigmatel.c