tree a9c94baebf4b33454673c600fe586b6c65600446
parent e9144754867b9ef431d54ea2a156f78feb196c34
parent 803a9067e19714ea7b7da760fe92f0d53bfa6994
author Linus Torvalds <torvalds@linux-foundation.org> 1215546057 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215546057 -0700

Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  SUNRPC: Fix an rpcbind breakage for the case of IPv6 lookups
  SUNRPC: Fix a double-free in rpcbind
  NFS: Fix readdir cache invalidation