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)
commit5ff5c3a4ab0d638fa63e939e75727c233b681e8d
treea62c2f95c31130c74beef53910cf66023765f355
parent18dcd3044e4c4b3ab6341c98e8d0e81e0d58d5e3
parent250f32747e62cb415b85083e247184188f24e566
Merge branch 'fix/hda' into topic/hda

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