Merge tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Mar 2015 18:31:38 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Mar 2015 18:31:38 +0000 (10:31 -0800)
commit7c5bde7adeba317d266b09db8ea9c3857eda86f5
tree0ad81b6e3ffe0725123da420e0ebfd16f602e053
parent1b1bd56191692e3a4a9079f469d9500005c89362
parent0164bf0239777811bdc3e01f45501174dc6db19d
Merge tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux

Pull file locking fix from Jeff Layton:
 "Just a single patch to fix a memory leak that Daniel Wagner discovered
  while doing some testing with leases"

* tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux:
  locks: fix fasync_struct memory leak in lease upgrade/downgrade handling