diff options
author | David S. Miller <davem@davemloft.net> | 2019-09-18 00:51:10 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-09-18 00:51:10 +0300 |
commit | 1bab8d4c488be22d57f9dd09968c90a0ddc413bf (patch) | |
tree | 81318cd13170a3b6b72489f63e92adb0eaf49693 /MAINTAINERS | |
parent | 990925fad5c227269c3fcb76c7c46811b1e86c73 (diff) | |
parent | 00b368502d18f790ab715e055869fd4bb7484a9b (diff) | |
download | linux-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.tar.xz |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Pull in bug fixes from 'net' tree for the merge window.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 32f4f05fb3da..dd39fc578607 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -649,6 +649,12 @@ M: Lino Sanfilippo <LinoSanfilippo@gmx.de> S: Maintained F: drivers/net/ethernet/alacritech/* +FORCEDETH GIGABIT ETHERNET DRIVER +M: Rain River <rain.1986.08.12@gmail.com> +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/nvidia/* + ALCATEL SPEEDTOUCH USB DRIVER M: Duncan Sands <duncan.sands@free.fr> L: linux-usb@vger.kernel.org @@ -17673,7 +17679,7 @@ F: Documentation/ABI/testing/sysfs-hypervisor-xen XEN NETWORK BACKEND DRIVER M: Wei Liu <wei.liu@kernel.org> -M: Paul Durrant <paul.durrant@citrix.com> +M: Paul Durrant <paul@xen.org> L: xen-devel@lists.xenproject.org (moderated for non-subscribers) L: netdev@vger.kernel.org S: Supported |