---

yaml --- r: 79555 b: refs/heads/master c: db1d08c h: refs/heads/master i: 79553: 89a549d 79551: b62157c v: v3
git-mirror · Jan 29, 2008 · 320e495 · 320e495
1 parent c5b1d1e
commit 320e495
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26b8256e2bb930a8e4d4d10aa74950d8921376b8
+refs/heads/master: db1d08c646e47f3c7835ecdabb51a906ec311f69
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -381,11 +381,6 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 
 EXPORT_SYMBOL(blk_rq_map_sg);
 
-/*
- * the standard queue merge functions, can be overridden with device
- * specific ones if so desired
- */
-
 static inline int ll_new_mergeable(struct request_queue *q,
 				   struct request *req,
 				   struct bio *bio)