diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-04-26 10:17:46 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-04-26 10:17:46 +0200 |
| commit | c248b27cfc0a8a5fee93e000d47e659bca335d0f (patch) | |
| tree | e4898df753acf2d2d9885844ea37b9f03ccf661c /MAINTAINERS | |
| parent | 28b17f6270f182e22cdad5a0fdc4979031e4486a (diff) | |
| parent | 50749f2dd6854a41830996ad302aef2ffaf011d8 (diff) | |
| download | lwn-c248b27cfc0a8a5fee93e000d47e659bca335d0f.tar.gz lwn-c248b27cfc0a8a5fee93e000d47e659bca335d0f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c2f3ecdb47e0..d51dc954edb5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8706,7 +8706,7 @@ F: drivers/input/touchscreen/goodix* GOOGLE ETHERNET DRIVERS M: Jeroen de Borst <jeroendb@google.com> -M: Catherine Sullivan <csully@google.com> +M: Praveen Kaligineedi <pkaligineedi@google.com> R: Shailend Chand <shailend@google.com> L: netdev@vger.kernel.org S: Supported @@ -16817,9 +16817,8 @@ F: include/uapi/linux/if_pppol2tp.h F: net/l2tp/l2tp_ppp.c PPP PROTOCOL DRIVERS AND COMPRESSORS -M: Paul Mackerras <paulus@samba.org> L: linux-ppp@vger.kernel.org -S: Maintained +S: Orphan F: drivers/net/ppp/ppp_* PPS SUPPORT |