]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/hda' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 15:00:18 +0000 (17:00 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 15:00:18 +0000 (17:00 +0200)
1  2 
sound/pci/hda/patch_conexant.c

Simple merge