Commit 6102f9e7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-maintainer-for-v5.12' of... 

Merge tag 'ti-k3-maintainer-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux into arm/fixes

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e2fc2de8 2672b94d

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -2617,8 +2617,8 @@ S: Maintained 
F:	drivers/power/reset/keystone-reset.c









ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE









M:	Tero Kristo <t-kristo@ti.com>









M:	Nishanth Menon <nm@ti.com>









M:	Tero Kristo <kristo@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









F:	Documentation/devicetree/bindings/arm/ti/k3.yaml








@@ -6474,9 +6474,9 @@ S:	Maintained







F:	drivers/edac/skx_*.[ch]

















EDAC-TI









M:	Tero Kristo <t-kristo@ti.com>









M:	Tero Kristo <kristo@kernel.org>









L:	linux-edac@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/edac/ti_edac.c

















EDIROL UA-101/UA-1000 DRIVER








@@ -17568,7 +17568,7 @@ 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








@@ -17712,9 +17712,9 @@ S:	Maintained







F:	drivers/clk/clk-cdce706.c

















TI CLOCK DRIVER









M:	Tero Kristo <t-kristo@ti.com>









M:	Tero Kristo <kristo@kernel.org>









L:	linux-omap@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/clk/ti/









F:	include/linux/clk/ti.h