Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:53:00 +0000 (08:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:53:00 +0000 (08:53 -0700)
commit0ee40c6628434f0535da31deeacc28b61e80d810
tree2873b9c932a63943fad22617b8385866e45347f5
parent236fa08168dd82af29a76c31c40b4148403774c0
parent2824bc9328467127083c1325f54b67d298c333b2
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
drivers/block/elevator.c
drivers/block/ll_rw_blk.c