]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Fri, 2 Mar 2012 08:00:33 +0000 (09:00 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 2 Mar 2012 08:00:33 +0000 (09:00 +0100)
commit585381f355eb83785534538429cac0c90194e979
tree871da898d9953dd50c4830400ba1dd0b614ee311
parent5522ac0ae4e60992788eae4318c5dca03faade5f
parent3aea9ef7fc12a307480b4914948f6028312babce
Merge branch 'fix/hda' into topic/hda

Speaker-Out renames are merged.

Conflicts:
sound/pci/hda/patch_realtek.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c