Merge commit 'v2.6.37-rc6' into for-2.6.38
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 17 Dec 2010 18:29:07 +0000 (13:29 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 17 Dec 2010 18:29:07 +0000 (13:29 -0500)
commitec66ee3797e5848356cf593c6ec7aabf30a00cf1
tree7ed5c84cc914644ffa1cd1b6a2b45db53fc224e8
parent1205065764f2eda3216ebe213143f69891ee3460
parentb0c3844d8af6b9f3f18f31e1b0502fbefa2166be
Merge commit 'v2.6.37-rc6' into for-2.6.38
fs/nfsd/nfs4state.c
net/sunrpc/svc_xprt.c