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

diff --cc MAINTAINERS
index b6e9c9905970d361d0fc221d607fae7d30131bae,da86a35674df1b1d00388ae6b67522b34d51f89b..5812d97e8520ed2d07ed3e3f06c0dfe48005ce13
--- 1/MAINTAINERS
--- 2/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>

diff --cc include/sound/tas2781.h
Simple merge

diff --cc sound/pci/hda/cirrus_scodec_test.c
Simple merge

diff --cc sound/pci/hda/cs35l56_hda.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/tas2781-fmwlib.c
Simple merge

diff --cc sound/soc/codecs/tas2781-i2c.c
Simple merge