Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Nov 2010 02:46:28 +0000 (18:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Nov 2010 02:46:28 +0000 (18:46 -0800)
commit1d6636502b23a964f4e5aac5237d1bbb76a9f912
treea904be940c83b385be9cdf33fc62041b5c56f7f5
parentd33fdee4d090076462cfe25473f7139c3204b16e
parent04e4bd1c67f941d81bff78a3b6b94194f081b7df
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:
  nfs: Ignore kmemleak false positive in nfs_readdir_make_qstr
  SUNRPC: Simplify rpc_alloc_iostats by removing pointless local variable
  nfs: trivial: remove unused nfs_wait_event macro
  NFS: readdir shouldn't read beyond the reply returned by the server
  NFS: Fix a couple of regressions in readdir.
  Revert "NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR"
  Regression: fix mounting NFS when NFSv3 support is not compiled
  NLM: Fix a regression in lockd