]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'locks' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2008 15:58:03 +0000 (07:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2008 15:58:03 +0000 (07:58 -0800)
commit9853832c49dc1685587abeb4e1decd4be690d256
tree13510327f85b8d8c238728b47ae74e0fa5299e17
parentb21761ff18c0eba67e8f2886b3c0b9cae79b5249
parentab1f16116527e42dec8aee176d673a41a881b809
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