From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Feb 2008 15:58:03 +0000 (-0800)
Subject: Merge branch 'locks' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.25-rc1~1060
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9853832c49dc1685587abeb4e1decd4be690d256;p=linux-2.6-omap-h63xx.git

Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

* 'locks' of git://linux-nfs.org/~bfields/linux:
  pid-namespaces-vs-locks-interaction
  file locks: Use wait_event_interruptible_timeout()
  locks: clarify posix_locks_deadlock
---

9853832c49dc1685587abeb4e1decd4be690d256