Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git

2006-01-12 13:34:47 +11:00
parent 0d1335b310 a4fc7ab1d0
commit ddae9c2ea7
65 changed files with 406 additions and 267 deletions
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -40,7 +40,6 @@
 #include "xfs_ialloc.h"
 #include "xfs_btree.h"
 #include "xfs_bmap.h"
-#include "xfs_bit.h"
 #include "xfs_rtalloc.h"
 #include "xfs_error.h"
 #include "xfs_itable.h"