Merge commit 'v2.6.36-rc1' into HEAD
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 26 Aug 2010 17:22:27 +0000 (13:22 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 26 Aug 2010 17:22:27 +0000 (13:22 -0400)
commitf632265d0ffb5acf331252d98c64939849d96bb2
tree31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b
parent7d94784293096c0a46897acdb83be5abd9278ece
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73
Merge commit 'v2.6.36-rc1' into HEAD
fs/nfsd/nfs4state.c