diff --git a/[refs] b/[refs]
index 76e2d2718301..dc33e44bd8ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bf722598fcd51073974850ae026b44389430ecc
+refs/heads/master: a168ee84c90b39ece357da127ab388f2f64db19c
diff --git a/trunk/block/Makefile b/trunk/block/Makefile
index 826108190f00..75597c1263e0 100644
--- a/trunk/block/Makefile
+++ b/trunk/block/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel block layer
 #
 
-obj-$(CONFIG_BLOCK) := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
+obj-$(CONFIG_BLOCK) := elevator.o blk-core.o ioctl.o genhd.o scsi_ioctl.o
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
 obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/blk-core.c
similarity index 100%
rename from trunk/block/ll_rw_blk.c
rename to trunk/block/blk-core.c