diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-03 14:32:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-03 14:32:15 +0300 |
| commit | a48e789dd2633bdeb6552dfdfedd0435f9c2f897 (patch) | |
| tree | c3da36cd25f47021bac6783bfb14ddc2413a4775 /MAINTAINERS | |
| parent | c67289e064cacda22ace61b8079a4e3f0e4aa520 (diff) | |
| parent | 0ebd5529d2ddab76a46681991d350b82c62ef13e (diff) | |
Merge tag 'linux-can-next-for-5.20-20220703' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2022-07-03
this is a pull request of 15 patches for net-next/master.
The first 2 patches are by Max Staudt and add the can327 serial CAN
driver along with a new line discipline ID.
The next patch is by me an fixes a typo in the ctucanfd driver.
The last 12 patches are by Dario Binacchi and integrate slcan CAN
serial driver better into the existing CAN driver API.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 99f8a65fd79b..28108e4fdb8f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7320,6 +7320,13 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/ibm/ehea/ +ELM327 CAN NETWORK DRIVER +M: Max Staudt <max@enpas.org> +L: linux-can@vger.kernel.org +S: Maintained +F: Documentation/networking/device_drivers/can/can327.rst +F: drivers/net/can/can327.c + EM28XX VIDEO4LINUX DRIVER M: Mauro Carvalho Chehab <mchehab@kernel.org> L: linux-media@vger.kernel.org |