Skip to content

Commit 6102f9e

Browse files
committed
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: Arnd Bergmann <[email protected]>
2 parents e2fc2de + 2672b94 commit 6102f9e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

MAINTAINERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2617,8 +2617,8 @@ S: Maintained
26172617
F: drivers/power/reset/keystone-reset.c
26182618

26192619
ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
2620-
M: Tero Kristo <[email protected]>
26212620
M: Nishanth Menon <[email protected]>
2621+
M: Tero Kristo <[email protected]>
26222622
L: [email protected] (moderated for non-subscribers)
26232623
S: Supported
26242624
F: Documentation/devicetree/bindings/arm/ti/k3.yaml
@@ -6474,9 +6474,9 @@ S: Maintained
64746474
F: drivers/edac/skx_*.[ch]
64756475

64766476
EDAC-TI
6477-
M: Tero Kristo <t-kristo@ti.com>
6477+
M: Tero Kristo <kristo@kernel.org>
64786478
6479-
S: Maintained
6479+
S: Odd Fixes
64806480
F: drivers/edac/ti_edac.c
64816481

64826482
EDIROL UA-101/UA-1000 DRIVER
@@ -17568,7 +17568,7 @@ F: include/linux/dma/k3-psil.h
1756817568

1756917569
TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
1757017570
M: Nishanth Menon <[email protected]>
17571-
M: Tero Kristo <t-kristo@ti.com>
17571+
M: Tero Kristo <kristo@kernel.org>
1757217572
M: Santosh Shilimkar <[email protected]>
1757317573
1757417574
S: Maintained
@@ -17712,9 +17712,9 @@ S: Maintained
1771217712
F: drivers/clk/clk-cdce706.c
1771317713

1771417714
TI CLOCK DRIVER
17715-
M: Tero Kristo <t-kristo@ti.com>
17715+
M: Tero Kristo <kristo@kernel.org>
1771617716
17717-
S: Maintained
17717+
S: Odd Fixes
1771817718
F: drivers/clk/ti/
1771917719
F: include/linux/clk/ti.h
1772017720

0 commit comments

Comments
 (0)