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)
1  2 
fs/nfsd/nfs4state.c
net/sunrpc/svc_xprt.c

Simple merge
Simple merge