From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 May 2025 04:14:42 +0000 (+1000)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ec140d24e82036cf8e289da8f47b75375a168647;p=users%2Fhch%2Fmisc.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
---

ec140d24e82036cf8e289da8f47b75375a168647
diff --cc MAINTAINERS
index b6e9c9905970,da86a35674df..5812d97e8520
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16461,8 -16289,8 +16461,9 @@@ F:	Documentation/devicetree/bindings/*/
  F:	arch/mips/include/asm/mach-loongson32/
  F:	arch/mips/loongson32/
  F:	drivers/*/*loongson1*
 +F:	drivers/mtd/nand/raw/loongson1-nand-controller.c
  F:	drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
+ F:	sound/soc/loongson/loongson1_ac97.c
  
  MIPS/LOONGSON2EF ARCHITECTURE
  M:	Jiaxun Yang <jiaxun.yang@flygoat.com>