projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[deliverable/linux.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index 42e65d128d015e1aa9c907d424bc2fcc09cfbebf..ecbb2f6a3ba04244a36b214ca021c1ff7f5c0897 100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-4744,7
+4744,7
@@
F: drivers/platform/x86/fujitsu-tablet.c
FUSE: FILESYSTEM IN USERSPACE
M: Miklos Szeredi <miklos@szeredi.hu>
FUSE: FILESYSTEM IN USERSPACE
M: Miklos Szeredi <miklos@szeredi.hu>
-L:
fuse-devel@lists.sourceforge.net
+L:
linux-fsdevel@vger.kernel.org
W: http://fuse.sourceforge.net/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
S: Maintained
W: http://fuse.sourceforge.net/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
S: Maintained
@@
-4903,7
+4903,7
@@
F: net/ipv4/gre_offload.c
F: include/net/gre.h
GRETH 10/100/1G Ethernet MAC device driver
F: include/net/gre.h
GRETH 10/100/1G Ethernet MAC device driver
-M:
Kristoffer Glembo <kristoffer
@gaisler.com>
+M:
Andreas Larsson <andreas
@gaisler.com>
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/aeroflex/
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/aeroflex/
@@
-10014,7
+10014,8
@@
F: drivers/infiniband/hw/ocrdma/
SFC NETWORK DRIVER
M: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
SFC NETWORK DRIVER
M: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
-M: Shradha Shah <sshah@solarflare.com>
+M: Edward Cree <ecree@solarflare.com>
+M: Bert Kenward <bkenward@solarflare.com>
L: netdev@vger.kernel.org
S: Supported
F: drivers/net/ethernet/sfc/
L: netdev@vger.kernel.org
S: Supported
F: drivers/net/ethernet/sfc/
This page took
0.038262 seconds
and
5
git commands to generate.