Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd039b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

parents e67b23c7 6f5a0f7c

block/as-iosched.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  linux/drivers/block/as-iosched.c

 *

 *  Anticipatory & deadline i/o scheduler.

 *

 *  Copyright (C) 2002 Jens Axboe <axboe@suse.de>

block/cfq-iosched.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  linux/drivers/block/cfq-iosched.c

 *

 *  CFQ, or complete fairness queueing, disk scheduler.

 *

 *  Based on ideas from a previously unfinished io

block/deadline-iosched.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  linux/drivers/block/deadline-iosched.c

 *

 *  Deadline i/o scheduler.

 *

 *  Copyright (C) 2002 Jens Axboe <axboe@suse.de>

block/elevator.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  linux/drivers/block/elevator.c

 *

 *  Block device elevator/IO-scheduler.

 *

 *  Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE

block/ll_rw_blk.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  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