diff options
author | 2011-11-23 17:08:42 +0100 | |
---|---|---|
committer | 2011-11-23 17:08:42 +0100 | |
commit | b37c0096b448d099d304bb47c4eada9117dba4cf (patch) | |
tree | c38f4c41874967a8f187e4c972b6365fb7a9f7cf /drivers/i2c | |
parent | Merge branch 'fix/hda' into topic/hda (diff) | |
parent | ALSA: hda/realtek - Minor cleanup (diff) | |
download | wireguard-linux-b37c0096b448d099d304bb47c4eada9117dba4cf.tar.xz wireguard-linux-b37c0096b448d099d304bb47c4eada9117dba4cf.zip |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions