diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-01-08 10:17:18 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-01-08 10:17:37 +0300 |
| commit | 821e2ac632ff77bf7abaf2dfad7214fe8563edf1 (patch) | |
| tree | 6d09654aed8ccd7f45f307191d350a0d7c236255 /MAINTAINERS | |
| parent | b6ce6e6c79e4ec650887f1fe391a70e54972001a (diff) | |
| parent | f90dffdce70ff724f9ee8b0bcc711e86e6663896 (diff) | |
| download | linux-821e2ac632ff77bf7abaf2dfad7214fe8563edf1.tar.xz | |
Merge branch 'for-next' into for-linus
Prepare for 6.8 merge.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ea790149af79..80c65096538c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8272,11 +8272,14 @@ L: linux-input@vger.kernel.org S: Maintained F: drivers/input/joystick/fsia6b.c -FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER +FOCUSRITE SCARLETT2 MIXER DRIVER (Scarlett Gen 2+ and Clarett) M: Geoffrey D. Bennett <g@b4.vu> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +W: https://github.com/geoffreybennett/scarlett-gen2 +B: https://github.com/geoffreybennett/scarlett-gen2/issues +T: git https://github.com/geoffreybennett/scarlett-gen2.git +F: include/uapi/sound/scarlett2.h F: sound/usb/mixer_scarlett2.c FORCEDETH GIGABIT ETHERNET DRIVER |