Merge commit 'v2.6.34-rc6'
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 4 May 2010 15:27:05 +0000 (11:27 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 4 May 2010 15:29:05 +0000 (11:29 -0400)
Conflicts:
fs/nfsd/nfs4callback.c

1  2 
fs/nfsd/export.c
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4proc.c
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c
fs/nfsd/nfsctl.c
fs/nfsd/vfs.c
net/sunrpc/svc_xprt.c

Simple merge
index ea77aa63754a5f3c5909c6a9811234f3d2540060,7e32bd394e8696afac48c56bc27c768155c9db7e..1d5051d46b4685a6993f3d53ac1e43a98367a84b
@@@ -32,7 -32,7 +32,8 @@@
   */
  
  #include <linux/sunrpc/clnt.h>
 +#include <linux/sunrpc/svc_xprt.h>
+ #include <linux/slab.h>
  #include "nfsd.h"
  #include "state.h"
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
Simple merge