| commit | 5ff5c3a4ab0d638fa63e939e75727c233b681e8d | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sat Apr 07 12:26:55 2012 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Sat Apr 07 12:26:55 2012 +0200 |
| tree | a62c2f95c31130c74beef53910cf66023765f355 | |
| parent | 18dcd3044e4c4b3ab6341c98e8d0e81e0d58d5e3 [diff] | |
| parent | 250f32747e62cb415b85083e247184188f24e566 [diff] |
Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_conexant.c