]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf369e28ff9887d0fe9b1f90713127728f76545e4
treec999d56c418920a9fda656259afb3f13dfd7616e
parenta1f326ce0ebc3e22ca419d1ecae727c34152f375
parent76b809b8641ee6ed3b6349b4078b77932c302f2c
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