Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable in…

…to integration
mariux64 · Jan 16, 2012 · 9785dbd · 9785dbd
2 parents d756bd2 + 6bf7e08
commit 9785dbd
Show file tree

Hide file tree

Showing 21 changed files with 1,639 additions and 419 deletions.
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
@@ -8,6 +8,6 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
 	   export.o tree-log.o free-space-cache.o zlib.o lzo.o \
 	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \
-	   reada.o backref.o
+	   reada.o backref.o ulist.o
 
 btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o