diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 09:45:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 09:45:22 -0700 |
| commit | 3674fbf0451df0395f9fa18df3122927006a3829 (patch) | |
| tree | 632690d6c74a7bedb166299bbc92059cd3a537f9 /MAINTAINERS | |
| parent | 9d797ee2dce1e3e243bcc18dad7728df72fd11a4 (diff) | |
| parent | 25a9c8a4431c364f97f75558cb346d2ad3f53fbb (diff) | |
| download | lwn-3674fbf0451df0395f9fa18df3122927006a3829.tar.gz lwn-3674fbf0451df0395f9fa18df3122927006a3829.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.5 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dd3becee7eae..095c4278a0f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3606,6 +3606,7 @@ S: Supported W: http://www.bluez.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +F: Documentation/devicetree/bindings/net/bluetooth/ F: drivers/bluetooth/ BLUETOOTH SUBSYSTEM @@ -12549,7 +12550,7 @@ F: drivers/mtd/nand/raw/marvell_nand.c MARVELL OCTEON ENDPOINT DRIVER M: Veerasenareddy Burru <vburru@marvell.com> -M: Abhijit Ayarekar <aayarekar@marvell.com> +M: Sathesh Edara <sedara@marvell.com> L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/marvell/octeon_ep |