Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Thu, 19 Apr 2012 15:17:59 +0000 (17:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 19 Apr 2012 15:20:13 +0000 (17:20 +0200)
commitd39801105722c9aef9eae180656190c399c576a9
treec999d56c418920a9fda656259afb3f13dfd7616e
parent83b0c6ba999643ee8ad6329f26e1cdc870e1a920
parentc817eebec5971febab86d397582954bd52f403a8
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_conexant.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_conexant.c