diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 13:49:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 13:49:44 -0800 |
| commit | bcd039b230f738243193ef7dbb03298d967b8370 (patch) | |
| tree | bec1988fa1d7f8dbcd445a82ad68c27330df03a9 /block | |
| parent | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (diff) | |
| parent | 6f5a0f7c955d3567f800fa36f978758cb5b99aa2 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'block')
| -rw-r--r-- | block/as-iosched.c | 2 | ||||
| -rw-r--r-- | block/cfq-iosched.c | 2 | ||||
| -rw-r--r-- | block/deadline-iosched.c | 2 | ||||
| -rw-r--r-- | block/elevator.c | 2 | ||||
| -rw-r--r-- | block/ll_rw_blk.c | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index a78e160b59a..fbe050124ec 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c @@ -1,6 +1,4 @@ /* - * linux/drivers/block/as-iosched.c - * * Anticipatory & deadline i/o scheduler. * * Copyright (C) 2002 Jens Axboe <axboe@suse.de> diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 2b64f5852bf..ee0bb41694b 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1,6 +1,4 @@ /* - * linux/drivers/block/cfq-iosched.c - * * CFQ, or complete fairness queueing, disk scheduler. * * Based on ideas from a previously unfinished io diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 7929471d7df..9cbec09e841 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -1,6 +1,4 @@ /* - * linux/drivers/block/deadline-iosched.c - * * Deadline i/o scheduler. * * Copyright (C) 2002 Jens Axboe <axboe@suse.de> diff --git a/block/elevator.c b/block/elevator.c index e4c58827bb4..6c3fc8a10bf 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -1,6 +1,4 @@ /* - * linux/drivers/block/elevator.c - * * Block device elevator/IO-scheduler. * * Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 5f52e30b43f..99c9ca6d599 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -1,6 +1,4 @@ /* - * linux/drivers/block/ll_rw_blk.c - * * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994, Karl Keyte: Added support for disk statistics * Elevator latency, (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE |