diff --git a/[refs] b/[refs]
index c7a6eb61f7e5..9245347deab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e67c0987d7567ad666641164a153dca9a43b11d
+refs/heads/master: bb4067e34159648d394943d5e2a011f838bff22f
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 62c7a3069d3a..536be740ba4e 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -82,7 +82,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio)
 	/*
 	 * must be same device and not a special request
 	 */
-	if (rq->rq_disk != bio->bi_bdev->bd_disk || !rq->special)
+	if (rq->rq_disk != bio->bi_bdev->bd_disk || rq->special)
 		return 0;
 
 	if (!elv_iosched_allow_merge(rq, bio))