Merge commit 'v2.6.34-rc6'

Conflicts:
	fs/nfsd/nfs4callback.c

diff --cc fs/nfsd/export.c
Simple merge

diff --cc fs/nfsd/nfs4callback.c
index ea77aa63754a5f3c5909c6a9811234f3d2540060,7e32bd394e8696afac48c56bc27c768155c9db7e..1d5051d46b4685a6993f3d53ac1e43a98367a84b
--- 1/fs/nfsd/nfs4callback.c
--- 2/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@@ -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"
  

diff --cc fs/nfsd/nfs4proc.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/nfs4xdr.c
Simple merge

diff --cc fs/nfsd/nfsctl.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc net/sunrpc/svc_xprt.c
Simple merge