diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-05 09:19:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-05 09:19:34 +0100 |
| commit | 5d8398aa595dc3055dde003b6464963b71e4d8e2 (patch) | |
| tree | 2b756dcea50d3ca0e5d2ac18f07384014f78ca5c /sound/pci/ice1712/prodigy192.c | |
| parent | 5fab5829674c279839a7408ab30c71c6dfe726b9 (diff) | |
| parent | 51d4efab7865e6ea6a4ebcd25b3f03c019515c4c (diff) | |
Merge branch 'for-linus' into for-next
Merge 5.5-rc devel branch back for applying the conflicting USB-audio
fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/prodigy192.c')
0 files changed, 0 insertions, 0 deletions