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

Merge tag 'locks-v3.15-3' of git://

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

* tag 'locks-v3.15-3' of git://
  MAINTAINERS: email address change for Jeff Layton
parents 8a9f5ecd 8c836fa8
......@@ -3556,7 +3556,7 @@ F: include/scsi/libfcoe.h
F: include/uapi/scsi/fc/
FILE LOCKING (flock() and fcntl()/lockf())
M: Jeff Layton <>
M: Jeff Layton <>
M: J. Bruce Fields <>
S: Maintained
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment