]> git.karo-electronics.de Git - linux-beck.git/commitdiff
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)
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c


No differences found