]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/hda' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sat, 4 Dec 2010 07:58:53 +0000 (08:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 4 Dec 2010 07:58:53 +0000 (08:58 +0100)
1  2 
sound/pci/hda/patch_conexant.c

Simple merge