]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/hda' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 14:32:02 +0000 (16:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 14:32:02 +0000 (16:32 +0200)
1  2 
sound/pci/hda/patch_conexant.c

Simple merge