]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit96feeb0349d3d4a32b1c33709a9c652ac20431b3
treea62c2f95c31130c74beef53910cf66023765f355
parent9bc3c6ca02b8fb48f44dd2906fe961ba668929a7
parentf1b04f1c069605d5b6cded256605e204df21e7ac
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_conexant.c