Merge commit 'v2.6.34-rc6'

Conflicts:
	fs/nfsd/nfs4callback.c

fs/nfsd/vfs.c

@@ -25,6 +25,7 @@
 #include <linux/xattr.h>
 #include <linux/jhash.h>
 #include <linux/ima.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <linux/exportfs.h>
 #include <linux/writeback.h>