diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-11-23 11:08:42 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-11-23 11:08:42 -0500 |
| commit | b37c0096b448d099d304bb47c4eada9117dba4cf (patch) | |
| tree | c38f4c41874967a8f187e4c972b6365fb7a9f7cf /sound/pci/via82xx_modem.c | |
| parent | 8b940fc457fbf883053caf397586a61bd3cae23e (diff) | |
| parent | 61071594f64ed12328046f94716d1d744bddc0a1 (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/via82xx_modem.c')
0 files changed, 0 insertions, 0 deletions