Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 9 Aug 2007 15:38:14 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 9 Aug 2007 15:38:14 +0000 (08:38 -0700)
commit8b80fc02b829a59602b0f53eb9393ffb2db2659d
tree9cce02e07ed1b30d6f6bd236a2d6015e5681eeb9
parent6a0ed91e361a93ee1efb4c20c4967024ed2a8dd7
parent4011cd97886dd04b90fef8b671b9936cd39ab983
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends
  NFS: Replace flush_scheduled_work with cancel_work_sync() and friends
  SUNRPC: Don't call gss_delete_sec_context() from an rcu context
  NFSv4: Don't call put_rpccred() from an rcu callback
  NFS: Fix NFSv4 open stateid regressions
  NFSv4: Fix a locking regression in nfs4_set_mode_locked()
  NFS: Fix put_nfs_open_context
  SUNRPC: Fix a race in rpciod_down()