]> git.baikalelectronics.ru Git - kernel.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)
commite5b4a649dfef788a2c76caff6ab35fce37d9e048
tree13510327f85b8d8c238728b47ae74e0fa5299e17
parent9dc50e6a329d89f49ad82f67a322c92baa43a6b5
parentf3c0b23d5a22d542568d9323d3692765f43cbd87
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