From 45df14abea6f226bccc8a2692887a6da5753559b Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Tue, 26 Aug 2008 16:23:20 +0100
Subject: [PATCH] --- yaml --- r: 115397 b: refs/heads/master c:
 9fa8d66f1e55bf197568c8c689043c2aad1ffc97 h: refs/heads/master i:   115395:
 eea1f4975d04bcac9f6fcc9fbc0b98c1ec52a759 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/nfs_xdr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d179d75015a0..756f48b5b3bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea31a4437c59219bf3ea946d58984b01a45a289c
+refs/heads/master: 9fa8d66f1e55bf197568c8c689043c2aad1ffc97
diff --git a/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h
index 8c77c11224d1..9cabbb3a9e6d 100644
--- a/trunk/include/linux/nfs_xdr.h
+++ b/trunk/include/linux/nfs_xdr.h
@@ -36,6 +36,7 @@ struct nfs_fattr {
 	__u32			nlink;
 	__u32			uid;
 	__u32			gid;
+	dev_t			rdev;
 	__u64			size;
 	union {
 		struct {
@@ -46,7 +47,6 @@ struct nfs_fattr {
 			__u64	used;
 		} nfs3;
 	} du;
-	dev_t			rdev;
 	struct nfs_fsid		fsid;
 	__u64			fileid;
 	struct timespec		atime;