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)
commit164c09978cebebd8b5fc198e9243777dbaecdfa0
tree0d20b5bddfc0eb1ad520f86f85bfc8a1a8c5baf6
parent8a9f5ecd4800ae43da17ea7bd93c75fde8f6ab20
parent8c836fa85bebfea26ceff024b5d1c518bf63f3d8
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
MAINTAINERS