Skip to content

Commit 84698da

Browse files
committed
Merge branch 'update-joakim-zhang-entries'
Florian Fainelli says: ==================== Update Joakim Zhang entries Shawn, since you are the i.MX maintainer I added you and the NXP Linux Team as the de-facto maintainers for those entries, however there may be other people to list, thanks! ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 5f7d78b + fb21cad commit 84698da

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Freescale INTMUX interrupt multiplexer
88

99
maintainers:
10-
- Joakim Zhang <[email protected]>
10+
- Shawn Guo <[email protected]>
11+
- NXP Linux Team <[email protected]>
1112

1213
properties:
1314
compatible:

Documentation/devicetree/bindings/net/fsl,fec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Freescale Fast Ethernet Controller (FEC)
88

99
maintainers:
10-
- Joakim Zhang <[email protected]>
10+
- Shawn Guo <[email protected]>
11+
- Wei Fang <[email protected]>
12+
- NXP Linux Team <[email protected]>
1113

1214
allOf:
1315
- $ref: ethernet-controller.yaml#

Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: NXP i.MX8 DWMAC glue layer
88

99
maintainers:
10-
- Joakim Zhang <[email protected]>
10+
- Clark Wang <[email protected]>
11+
- Shawn Guo <[email protected]>
12+
- NXP Linux Team <[email protected]>
1113

1214
# We need a select here so we don't match all nodes with 'snps,dwmac'
1315
select:

MAINTAINERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8183,7 +8183,10 @@ S: Maintained
81838183
F: drivers/i2c/busses/i2c-cpm.c
81848184

81858185
FREESCALE IMX / MXC FEC DRIVER
8186-
M: Joakim Zhang <[email protected]>
8186+
M: Wei Fang <[email protected]>
8187+
R: Shenwei Wang <[email protected]>
8188+
R: Clark Wang <[email protected]>
8189+
R: NXP Linux Team <[email protected]>
81878190
81888191
S: Maintained
81898192
F: Documentation/devicetree/bindings/net/fsl,fec.yaml

0 commit comments

Comments
 (0)