From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 17:14:23 +0000 (-0700)
Subject: Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.28-rc1~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=33217379becdee25021cabb25032b3bf703d0e96;p=linux-2.6-omap-h63xx.git

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
---

33217379becdee25021cabb25032b3bf703d0e96