Merge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:53:49 +0000 (08:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:53:49 +0000 (08:53 -0700)
commit28d721e24c88496ff8e9c4a0959bdc1415c0658e
tree0652161bbbcbfddf47c7ddb25d2db8ecd4cbec89
parent0ee40c6628434f0535da31deeacc28b61e80d810
parentcb19833dccb32f97cacbfff834b53523915f13f6
Merge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block
drivers/block/as-iosched.c
drivers/block/cfq-iosched.c
drivers/block/deadline-iosched.c
drivers/block/elevator.c
drivers/block/ll_rw_blk.c
include/linux/blkdev.h
include/linux/elevator.h