diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-19 17:17:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-19 17:20:13 +0200 |
| commit | d39801105722c9aef9eae180656190c399c576a9 (patch) | |
| tree | c999d56c418920a9fda656259afb3f13dfd7616e /sound/pci/hda/patch_cirrus.c | |
| parent | 83b0c6ba999643ee8ad6329f26e1cdc870e1a920 (diff) | |
| parent | c817eebec5971febab86d397582954bd52f403a8 (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_conexant.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
0 files changed, 0 insertions, 0 deletions