Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux
Merge commit. Changes below are compared with the first parent: 8a9f5ecd.
Changes
1 files changed · +1 −1
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| MAINTAINERS | modified | +1 | −1 | View file |
MAINTAINERS
View filediff --git a/MAINTAINERS b/MAINTAINERS
index 6bef70b..1066264 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3556,7 +3556,7 @@ F: include/scsi/libfcoe.h
F: include/uapi/scsi/fc/
FILE LOCKING (flock() and fcntl()/lockf())
-M: Jeff Layton <[email protected]>
+M: Jeff Layton <[email protected]>
M: J. Bruce Fields <[email protected]>
S: Maintained