Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 164c0997 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8a9f5ecd 8c836fa8

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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