From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Tue, 4 May 2010 15:27:05 +0000 (-0400)
Subject: Merge commit 'v2.6.34-rc6'
X-Git-Tag: v2.6.35-rc1~489^2~15
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5306293c9cd2caf41849cc909281bda628bb989e

Merge commit 'v2.6.34-rc6'

Conflicts:
	fs/nfsd/nfs4callback.c
---

5306293c9cd2caf41849cc909281bda628bb989e
diff --cc fs/nfsd/nfs4callback.c
index ea77aa63754a,7e32bd394e86..1d5051d46b46
--- a/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"