diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 19:47:44 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 19:47:44 +0100 |
commit | e4bdda1bc3123a9e65f4dd93a23041fde8ed3dc2 (patch) | |
tree | c2f75cc08bb4c5cbd9103e14399ea5ab66ce960d /arch/blackfin/kernel/traps.c | |
parent | Merge branch 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff) | |
parent | NFSv4: Fix a regression in the NFSv4 state manager (diff) | |
download | linux-e4bdda1bc3123a9e65f4dd93a23041fde8ed3dc2.tar.xz linux-e4bdda1bc3123a9e65f4dd93a23041fde8ed3dc2.zip |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFSv4: Fix a regression in the NFSv4 state manager
NFSv4: Release the sequence id before restarting a CLOSE rpc call
nfs41: fix session fore channel negotiation
nfs41: do not zero seqid portion of stateid on close
nfs: run state manager in privileged mode
nfs: make recovery state manager operations privileged
nfs: enforce FIFO ordering of operations trying to acquire slot
rpc: add a new priority in RPC task
nfs: remove rpc_task argument from nfs4_find_slot
rpc: add rpc_queue_empty function
nfs: change nfs4_do_setlk params to identify recovery type
nfs: do not do a LOOKUP after open
nfs: minor cleanup of session draining
Diffstat (limited to 'arch/blackfin/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions