diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-04 17:36:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-04 17:36:52 -0400 |
| commit | 164c09978cebebd8b5fc198e9243777dbaecdfa0 (patch) | |
| tree | 0d20b5bddfc0eb1ad520f86f85bfc8a1a8c5baf6 | |
| parent | 8a9f5ecd4800ae43da17ea7bd93c75fde8f6ab20 (diff) | |
| parent | 8c836fa85bebfea26ceff024b5d1c518bf63f3d8 (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-- | MAINTAINERS | 2 |
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 | |||
| 3556 | F: include/uapi/scsi/fc/ | 3556 | F: include/uapi/scsi/fc/ |
| 3557 | 3557 | ||
| 3558 | FILE LOCKING (flock() and fcntl()/lockf()) | 3558 | FILE LOCKING (flock() and fcntl()/lockf()) |
| 3559 | M: Jeff Layton <jlayton@redhat.com> | 3559 | M: Jeff Layton <jlayton@poochiereds.net> |
| 3560 | M: J. Bruce Fields <bfields@fieldses.org> | 3560 | M: J. Bruce Fields <bfields@fieldses.org> |
| 3561 | L: linux-fsdevel@vger.kernel.org | 3561 | L: linux-fsdevel@vger.kernel.org |
| 3562 | S: Maintained | 3562 | S: Maintained |