]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge tag 'ti-k3-maintainer-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Feb 2021 16:42:26 +0000 (17:42 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 2 Feb 2021 16:42:27 +0000 (17:42 +0100)
Maintainer changes for TI for v5.12 merge window:

- Tero switches to kernel.org address

* tag 'ti-k3-maintainer-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux:
  MAINTAINERS: Update my email address and maintainer level status

Link: https://lore.kernel.org/r/20210130131411.afna4wj72r7xscqn@skinny
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
index f545261885f1011c259b360c1c827bd9537c5c37,ba3e71fde323707526f6f72526a17581a274f234..d25fb81110cad0bad6bd40e37de8093075d813bd
@@@ -17553,22 -17553,9 +17553,22 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
  F:    drivers/iio/dac/ti-dac7612.c
  
 +TEXAS INSTRUMENTS DMA DRIVERS
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
 +L:    dmaengine@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
 +F:    Documentation/devicetree/bindings/dma/ti-edma.txt
 +F:    Documentation/devicetree/bindings/dma/ti/
 +F:    drivers/dma/ti/
 +X:    drivers/dma/ti/cppi41.c
 +F:    include/linux/dma/k3-udma-glue.h
 +F:    include/linux/dma/ti-cppi5.h
 +F:    include/linux/dma/k3-psil.h
 +
  TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
  M:    Nishanth Menon <nm@ti.com>
- M:    Tero Kristo <t-kristo@ti.com>
+ M:    Tero Kristo <kristo@kernel.org>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained