projects/linux·commit 164c0997

Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux

164c0997 · Linus Torvalds <[email protected]> · 2014-05-04 14:36:52 -07:00

Pull file locking change from Jeff Layton:
 "Only an email address change to the MAINTAINERS file"

* tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux:
  MAINTAINERS: email address change for Jeff Layton
Commit
164c09978cebebd8b5fc198e9243777dbaecdfa0
Parents
8a9f5ecd · 8c836fa8

Merge commit. Changes below are compared with the first parent: 8a9f5ecd.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
MAINTAINERSmodified+1−1View file

MAINTAINERS

View file
diff --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