git.cascardo.eti.br Git - cascardo/linux.git/commit

Merge branch 'fix/hda' into topic/hda

Speaker-Out renames are merged.

Conflicts:
sound/pci/hda/patch_realtek.c

Unnamed repository; edit this file 'description' to name the repository.

sound/pci/hda/hda_codec.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.h	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_conexant.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_sigmatel.c	diff1 \|	diff2 \|	blob \| history