Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 17:14:23 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 17:14:23 +0000 (10:14 -0700)
commit33217379becdee25021cabb25032b3bf703d0e96
tree27cfbb722a523950ec8c9f616f28a1767498601a
parentfeeedc6c820e1026453ad865076cee435f24d30a
parent30bc4dfd3b64eb1fbefe2c63e30d8fc129273e20
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
  nfsd: clean up expkey_parse error cases
  nfsd: Drop reference in expkey_parse error cases
  nfsd: Fix memory leak in nfsd_getxattr
  NFSD: Fix BUG during NFSD shutdown processing