diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 18:38:16 (GMT) |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 18:38:16 (GMT) |
| commit | 9c78965ca18594fe0a34a1a1b13781b10f85e4bc (patch) | |
| tree | 60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57 /fs/xfs/linux-2.6/xfs_trace.c | |
| parent | 139ef32b0e6b88b00b5e3e74d052d938f178dc9b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
| download | linux-fsl-qoriq-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_trace.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_trace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_trace.c b/fs/xfs/linux-2.6/xfs_trace.c index 207fa77..d12be84 100644 --- a/fs/xfs/linux-2.6/xfs_trace.c +++ b/fs/xfs/linux-2.6/xfs_trace.c @@ -50,7 +50,6 @@ #include "quota/xfs_dquot_item.h" #include "quota/xfs_dquot.h" #include "xfs_log_recover.h" -#include "xfs_buf_item.h" #include "xfs_inode_item.h" /* |