tree a09c0a4f8fe995bea2dde0ea4fa5dbdd32cf3fd4
parent 75e1c70fc31490ef8a373ea2a4bea2524099b478
parent 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0
author Linus Torvalds <torvalds@linux-foundation.org> 1284509088 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284509088 -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 the NFSv4 and RPCSEC_GSS Kconfig dependencies
  statfs() gives ESTALE error
  NFS: Fix a typo in nfs_sockaddr_match_ipaddr6
  sunrpc: increase MAX_HASHTABLE_BITS to 14
  gss:spkm3 miss returning error to caller when import security context
  gss:krb5 miss returning error to caller when import security context
  Remove incorrect do_vfs_lock message
  SUNRPC: cleanup state-machine ordering
  SUNRPC: Fix a race in rpc_info_open
  SUNRPC: Fix race corrupting rpc upcall
  Fix null dereference in call_allocate