diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /fs/xfs/xfs_rw.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'fs/xfs/xfs_rw.c')
| -rw-r--r-- | fs/xfs/xfs_rw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c index defb2febaaf5..1ea7c0ca6ae0 100644 --- a/fs/xfs/xfs_rw.c +++ b/fs/xfs/xfs_rw.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include "xfs_attr.h" | 42 | #include "xfs_attr.h" |
| 43 | #include "xfs_bmap.h" | 43 | #include "xfs_bmap.h" |
| 44 | #include "xfs_acl.h" | 44 | #include "xfs_acl.h" |
| 45 | #include "xfs_mac.h" | ||
| 46 | #include "xfs_error.h" | 45 | #include "xfs_error.h" |
| 47 | #include "xfs_buf_item.h" | 46 | #include "xfs_buf_item.h" |
| 48 | #include "xfs_rw.h" | 47 | #include "xfs_rw.h" |