diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-31 06:04:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-31 06:04:37 +0200 |
| commit | 35e274458c1d64dfcb725bb23a097c925dcd653d (patch) | |
| tree | b0d265bc448d5923b1221f46d130d44456032e93 /drivers | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease (diff) | |
| download | linux-35e274458c1d64dfcb725bb23a097c925dcd653d.tar.xz linux-35e274458c1d64dfcb725bb23a097c925dcd653d.zip | |
Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux
Pull file locking bugfx from Jeff Layton:
"Just a bugfix for a bug that crept in to v3.15. It's in a rather rare
error path, and I'm not aware of anyone having hit it, but it's worth
fixing for v3.17"
* tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux:
locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions