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/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -33,6 +33,7 @@
 *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <linux/file.h>
+#include <linux/slab.h>

 #include "cache.h"
 #include "xdr4.h"