---

yaml --- r: 79556 b: refs/heads/master c: d6d4819 h: refs/heads/master v: v3
git-mirror · Jan 29, 2008 · 42856d2 · 42856d2
1 parent 320e495
commit 42856d2
Show file tree

Hide file tree

Showing 5 changed files with 496 additions and 482 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db1d08c646e47f3c7835ecdabb51a906ec311f69
+refs/heads/master: d6d48196961729b79509dcaeeb0f0fb4fbb47d29
diff --git a/trunk/block/Makefile b/trunk/block/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
 			blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \
-			blk-exec.o ioctl.o genhd.o scsi_ioctl.o
+			blk-exec.o blk-merge.o ioctl.o genhd.o scsi_ioctl.o
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
 obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o