]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbff338f63c6e06b270c8e2ba85f4c8964f13d6ce
tree21d6b8168670f22521f3bb703e3b9d1932566c1c
parent71aa7cf09c53f75d2358b50264a6da896674a87c
parent915a24db9df5a6d9f38d722a474cb44ed8bb0fa5
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