]> 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)
commitb3cef1d13879c69cadae72e3f1518a60a71d1e4d
treea62c2f95c31130c74beef53910cf66023765f355
parent0c84f1e67d659b2916d80f3a5efd30da2b3620ff
parentb928dce0b339ed7012bfe9e3ef42bee4e3417fe3
Merge branch 'fix/hda' into topic/hda

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