diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-18 08:55:55 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-18 08:55:55 +0300 |
commit | 48a789079a146ecd916e29cc5e47410d9cb05fbe (patch) | |
tree | 04f890f10e9cbdd97b4bf72647656ec94cb8d51f /MAINTAINERS | |
parent | 2478be82de44bee4346eb1f48d4cfa28cd99d2d0 (diff) | |
parent | b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce (diff) | |
download | linux-48a789079a146ecd916e29cc5e47410d9cb05fbe.tar.xz |
Merge 5.7-rc6 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f71212eb845e..2d5ac1b89ed3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11718,8 +11718,9 @@ F: net/core/drop_monitor.c NETWORKING DRIVERS M: "David S. Miller" <davem@davemloft.net> +M: Jakub Kicinski <kuba@kernel.org> L: netdev@vger.kernel.org -S: Odd Fixes +S: Maintained W: http://www.linuxfoundation.org/en/Net Q: http://patchwork.ozlabs.org/project/netdev/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git @@ -14642,6 +14643,7 @@ F: drivers/iommu/s390-iommu.c S390 IUCV NETWORK LAYER M: Julian Wiedmann <jwi@linux.ibm.com> +M: Karsten Graul <kgraul@linux.ibm.com> M: Ursula Braun <ubraun@linux.ibm.com> L: linux-s390@vger.kernel.org S: Supported @@ -14652,6 +14654,7 @@ F: net/iucv/ S390 NETWORK DRIVERS M: Julian Wiedmann <jwi@linux.ibm.com> +M: Karsten Graul <kgraul@linux.ibm.com> M: Ursula Braun <ubraun@linux.ibm.com> L: linux-s390@vger.kernel.org S: Supported |