Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Sat, 7 Apr 2012 10:26:55 +0000 (12:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 7 Apr 2012 10:26:55 +0000 (12:26 +0200)
Conflicts:
sound/pci/hda/patch_conexant.c


Trivial merge