diff options
| author | Alex Elder <aelder@sgi.com> | 2009-09-15 22:37:47 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-15 22:37:47 -0400 |
| commit | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (patch) | |
| tree | bcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59 /fs/xfs/linux-2.6/xfs_iops.c | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
| parent | 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 (diff) | |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Conflicts:
fs/xfs/linux-2.6/xfs_lrw.c
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_iops.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 6c32f1d63d8c..da0159d99f82 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include "xfs_error.h" | 43 | #include "xfs_error.h" |
| 44 | #include "xfs_itable.h" | 44 | #include "xfs_itable.h" |
| 45 | #include "xfs_rw.h" | 45 | #include "xfs_rw.h" |
| 46 | #include "xfs_acl.h" | ||
| 47 | #include "xfs_attr.h" | 46 | #include "xfs_attr.h" |
| 48 | #include "xfs_buf_item.h" | 47 | #include "xfs_buf_item.h" |
| 49 | #include "xfs_utils.h" | 48 | #include "xfs_utils.h" |