| commit | 7420a8c0de8d99b201aeeab6fed16ca95ebf55a5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 27 18:13:34 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 27 18:13:34 2010 -0700 |
| tree | 0787800f490f98ffd41b958e52ab15732335744e | |
| parent | 12ba8d1e9262ce81a695795410bd9ee5c9407ba1 [diff] | |
| parent | 72f98e72551fad573c6cace8e8551ef094f482dd [diff] |
Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl * 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: locks: turn lock_flocks into a spinlock fasync: re-organize fasync entry insertion to allow it under a spinlock locks/nfsd: allocate file lock outside of spinlock lockd: fix nlmsvc_notify_blocked locking lockd: push lock_flocks down