git.samba.org - sfrench/cifs-2.6.git/commit

Merge branch 'test/hda-jack' into topic/hda

Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.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_cirrus.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_hdmi.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
sound/pci/hda/patch_via.c	diff1 \|	diff2 \|	blob \| history