diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
| commit | 241bc82e62b28fdb7223b85180fd814f4963c971 (patch) | |
| tree | f0d1a3889fd027e017faa37fc34bffe2fa038c41 /sound/usb/endpoint.h | |
| parent | ALSA: firewire-motu: add support for MOTU Audio Express (diff) | |
| parent | ALSA: core: Fix unexpected error at replacing user TLV (diff) | |
| download | linux-241bc82e62b28fdb7223b85180fd814f4963c971.tar.xz linux-241bc82e62b28fdb7223b85180fd814f4963c971.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/core/control.c
Diffstat (limited to 'sound/usb/endpoint.h')
0 files changed, 0 insertions, 0 deletions