diff options
| author | Alex Elder <aelder@sgi.com> | 2010-06-04 13:22:30 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-06-04 13:22:30 -0500 |
| commit | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch) | |
| tree | fdb99e686fa40e79cc53f80dfed58e9b548ed4eb /fs/xfs/linux-2.6/xfs_trace.c | |
| parent | ad8456361fa19068cf49b50a4f98e41b73c08e76 (diff) | |
| parent | f9369729496a0f4c607a4cc1ea4dfeddbbfc505a (diff) | |
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 207fa77f63a..d12be8470cb 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" /* |