diff options
author | David S. Miller <davem@davemloft.net> | 2018-01-23 13:49:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-23 13:51:56 -0500 |
commit | 5ca114400dcd46f19f31573e7c60e638bd8d644b (patch) | |
tree | d78dc56c94548d865e505f022c08006716bdb963 /MAINTAINERS | |
parent | f53d77e19b6587527a3dd60a0e638f115e5cd7a9 (diff) | |
parent | a84a8ab94ed5cb65a1355fe9e8d1d55283375808 (diff) | |
download | op-kernel-dev-5ca114400dcd46f19f31573e7c60e638bd8d644b.zip op-kernel-dev-5ca114400dcd46f19f31573e7c60e638bd8d644b.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.
The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 079af8b..7ec1b08 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9102,6 +9102,7 @@ F: drivers/usb/image/microtek.* MIPS M: Ralf Baechle <ralf@linux-mips.org> +M: James Hogan <jhogan@kernel.org> L: linux-mips@linux-mips.org W: http://www.linux-mips.org/ T: git git://git.linux-mips.org/pub/scm/ralf/linux.git |