Merge branch 'test/hda-jack' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 20 Dec 2011 14:42:57 +0000 (15:42 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 20 Dec 2011 14:42:57 +0000 (15:42 +0100)
commit78c058df6a120044455b5635daefdc515bf9d899
treed349e70e384404a9a2d9860feb0219e9f8acb212
parentdb9c6f842fa957b41984cd8ceea1f07c53fb3fbf
parent31ef22579302ac42054bebecb528710f46580925
Merge branch 'test/hda-jack' into topic/hda

Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c
sound/pci/hda/patch_via.c