diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 16:58:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 16:58:03 +0100 |
| commit | 9853832c49dc1685587abeb4e1decd4be690d256 (patch) | |
| tree | 13510327f85b8d8c238728b47ae74e0fa5299e17 /drivers/net/tokenring | |
| parent | kbuild: Fix instrumentation removal breakage on avr32 (diff) | |
| parent | pid-namespaces-vs-locks-interaction (diff) | |
| download | linux-9853832c49dc1685587abeb4e1decd4be690d256.tar.xz linux-9853832c49dc1685587abeb4e1decd4be690d256.zip | |
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
Diffstat (limited to 'drivers/net/tokenring')
0 files changed, 0 insertions, 0 deletions