From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 May 2014 21:36:52 +0000 (-0700)
Subject: Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux
X-Git-Tag: firefly_0821_release~176^2~3954
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=164c09978cebebd8b5fc198e9243777dbaecdfa0;p=firefly-linux-kernel-4.4.55.git

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
---

164c09978cebebd8b5fc198e9243777dbaecdfa0