From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=164c09978cebebd8b5fc198e9243777dbaecdfa0;p=linux-beck.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