tree 0787800f490f98ffd41b958e52ab15732335744e
parent 12ba8d1e9262ce81a695795410bd9ee5c9407ba1
parent 72f98e72551fad573c6cace8e8551ef094f482dd
author Linus Torvalds <torvalds@linux-foundation.org> 1288228414 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288228414 -0700

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