Merge commit 'v2.6.34-rc6'

Conflicts: fs/nfsd/nfs4callback.c
2010-05-04 11:27:05 -04:00
parent dbd65a7e44 66f41d4c5c
commit 5306293c9c
6701 changed files with 157843 additions and 66516 deletions
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -12,6 +12,7 @@
 * Copyright (C) 1995, 1996 Olaf Kirch, <okir@monad.swb.de>
 */

+#include <linux/slab.h>
 #include <linux/namei.h>
 #include <linux/module.h>
 #include <linux/exportfs.h>