summaryrefslogtreecommitdiffstats
path: root/net/dccp/ccid.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-08-31 08:27:10 +0200
committerTakashi Iwai <tiwai@suse.de>2009-08-31 08:27:10 +0200
commitbe0ae923a40bbee8a0f02c1cd4b70656e729096f (patch)
treefa18d300c59e7845c08290346587186c2890cff7 /net/dccp/ccid.h
parentALSA: hda - Fix ALC268/ALC269 headphone pin routing (diff)
parentALSA: hda - Fix MacBookPro 3,1/4,1 quirk with ALC889A (diff)
downloadlinux-be0ae923a40bbee8a0f02c1cd4b70656e729096f.tar.xz
linux-be0ae923a40bbee8a0f02c1cd4b70656e729096f.zip
Merge branch 'fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_realtek.c
Diffstat (limited to 'net/dccp/ccid.h')
0 files changed, 0 insertions, 0 deletions