Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 May 2014 21:36:52 +0000 (14:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 May 2014 21:36:52 +0000 (14:36 -0700)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge