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)
commit7c589750a70831b8cee3c10e01c297fefde104e3
tree871da898d9953dd50c4830400ba1dd0b614ee311
parent07cafff288266c3aa082f4bda3d47989e73ee85d
parente49a3434f1bc64dc49ff3a56e416bb5894868dde
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