diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
| commit | 64c0ce555ad2d84f497f5f584ddd31e87ac690a2 (patch) | |
| tree | 36413d636cc2f09bbec2a00036550b87d88724d9 /MAINTAINERS | |
| parent | 1a529af6f81e54f15df162a0c703459937941c54 (diff) | |
| parent | 134536c21275bb3410cd1f10c5e369d30702741d (diff) | |
Merge branch 'for-linus' into for-next
Pull 6.11 fixes to 6.12-devel branch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f8a645bcf2b1..4eb6e898a7ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11141,12 +11141,12 @@ F: drivers/gpio/gpio-i8255.h INTEL ASoC DRIVERS M: Cezary Rojewski <cezary.rojewski@intel.com> -M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> M: Liam Girdwood <liam.r.girdwood@linux.intel.com> M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> M: Bard Liao <yung-chuan.liao@linux.intel.com> M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> M: Kai Vehmanen <kai.vehmanen@linux.intel.com> +R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/intel/ @@ -21350,13 +21350,13 @@ S: Maintained F: tools/sound/dapm-graph SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS -M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> M: Liam Girdwood <lgirdwood@gmail.com> M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> M: Bard Liao <yung-chuan.liao@linux.intel.com> M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> M: Daniel Baluta <daniel.baluta@nxp.com> R: Kai Vehmanen <kai.vehmanen@linux.intel.com> +R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> L: sound-open-firmware@alsa-project.org (moderated for non-subscribers) S: Supported W: https://github.com/thesofproject/linux/ @@ -21365,7 +21365,7 @@ F: sound/soc/sof/ SOUNDWIRE SUBSYSTEM M: Vinod Koul <vkoul@kernel.org> M: Bard Liao <yung-chuan.liao@linux.intel.com> -R: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> +R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> R: Sanyog Kale <sanyog.r.kale@intel.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported |