| commit | 164c09978cebebd8b5fc198e9243777dbaecdfa0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 04 14:36:52 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 04 14:36:52 2014 -0700 |
| 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