Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-04 14:36:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-04 14:36:52 -0700
commit164c09978cebebd8b5fc198e9243777dbaecdfa0 (patch)
tree0d20b5bddfc0eb1ad520f86f85bfc8a1a8c5baf6
parent8a9f5ecd4800ae43da17ea7bd93c75fde8f6ab20 (diff)
parent8c836fa85bebfea26ceff024b5d1c518bf63f3d8 (diff)
Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux
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
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6bef70b614c9..106626442124 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 <jlayton@redhat.com>
+M: Jeff Layton <jlayton@poochiereds.net>
M: J. Bruce Fields <bfields@fieldses.org>
L: linux-fsdevel@vger.kernel.org
S: Maintained