tree 34c518a9fd51385848eb2f1017c9b0b81757a2c6
parent d3a36fb82a0864a85e238ac946817030a18c5f9a
parent dd504ea16f34a29da4aa933ae7ab917fcfd25fd7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1179458083 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1179458083 -0700

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC: Fix sparse warnings
  NLM: Fix sparse warnings
  NFS: Fix more sparse warnings
  NFS: Fix some 'sparse' warnings...
  SUNRPC: remove dead variable 'rpciod_running'
  NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c
  NFS: use zero_user_page
  NLM: don't use CLONE_SIGHAND in nlmclnt_recovery
  NLM: Fix locking client timeouts...