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/caiaq/device.c | |
| parent | 3a93d082bacf887b47737c4b75c083dea7570832 (diff) | |
| parent | 88c54cdf61f508ebcf8da2d819f5dfc03e954d1d (diff) | |
| download | blackbird-obmc-linux-241bc82e62b28fdb7223b85180fd814f4963c971.tar.gz blackbird-obmc-linux-241bc82e62b28fdb7223b85180fd814f4963c971.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/core/control.c
Diffstat (limited to 'sound/usb/caiaq/device.c')
0 files changed, 0 insertions, 0 deletions
