Merge branch 'delayed-logging-for-2.6.35' into for-linus

2010-05-24 11:57:36 -05:00
parent 7e125f7b9c ccf7c23fc1
commit 88e88374ee
27 changed files with 2411 additions and 542 deletions
--- a/fs/xfs/linux-2.6/xfs_quotaops.c
+++ b/fs/xfs/linux-2.6/xfs_quotaops.c
@ -19,6 +19,7 @@
 #include "xfs_dmapi.h"
 #include "xfs_sb.h"
 #include "xfs_inum.h"
+#include "xfs_log.h"
 #include "xfs_ag.h"
 #include "xfs_mount.h"
 #include "xfs_quota.h"