| commit | 9853832c49dc1685587abeb4e1decd4be690d256 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 04 07:58:03 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 04 07:58:03 2008 -0800 |
| tree | 13510327f85b8d8c238728b47ae74e0fa5299e17 | |
| parent | b21761ff18c0eba67e8f2886b3c0b9cae79b5249 [diff] | |
| parent | ab1f16116527e42dec8aee176d673a41a881b809 [diff] |
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