tree 93adaf1666942024cce4e3aa0bc58f0f1095bd2f
parent 8bd93ca7b03f38a7bc1a4ed9e93e8c006e753d5b
parent 5f707eb429e2c98dfd564ffbbd9f536bf493d869
author Linus Torvalds <torvalds@linux-foundation.org> 1225396302 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225396302 -0700

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:
  SUNRPC: Fix potential race in put_rpccred()
  SUNRPC: Fix rpcauth_prune_expired
  NFS: Convert nfs_attr_generation_counter into an atomic_long
  SUNRPC: Respond promptly to server TCP resets