Merge branch 'topic/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 May 2010 09:59:52 +0000 (11:59 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 20 May 2010 09:59:52 +0000 (11:59 +0200)
1  2 
sound/pci/hda/patch_conexant.c

Simple merge