From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 01:13:34 +0000 (-0700)
Subject: Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
X-Git-Tag: v2.6.37-rc1~90
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=7420a8c0de8d99b201aeeab6fed16ca95ebf55a5

Merge branch 'flock' of git://git./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
---

7420a8c0de8d99b201aeeab6fed16ca95ebf55a5