diff --git a/[refs] b/[refs]
index 6fd9bf5e197a..eeb7e3a8f751 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28e7d1845216538303bb95d679d8fd4de50e2f1a
+refs/heads/master: 8839a0e055d9abd6c011d533373a8dd266cad011
diff --git a/trunk/block/Makefile b/trunk/block/Makefile
index 0bb499a739cd..f627e4b1a9da 100644
--- a/trunk/block/Makefile
+++ b/trunk/block/Makefile
@@ -3,7 +3,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-flush.o blk-settings.o blk-ioc.o blk-map.o \
 			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
 			blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o
 
diff --git a/trunk/block/blk-barrier.c b/trunk/block/blk-flush.c
similarity index 100%
rename from trunk/block/blk-barrier.c
rename to trunk/block/blk-flush.c