Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 19 Jan 2010 14:53:43 +0000 (15:53 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 19 Jan 2010 14:53:43 +0000 (15:53 +0100)
commit9e4c84967ef027fe50a03cf48dd6da9519c8e60c
tree21d6b8168670f22521f3bb703e3b9d1932566c1c
parentd2f2fcd2541bae004db7f4798ffd9d2cb75ae817
parent3fb4a508b8e7957aa899f32cd6d9d462e102c7ca
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c
sound/core/pcm_native.c
sound/pci/ac97/ac97_patch.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c