Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block
commit333c47c847c90aaefde8b593054d9344106333b5
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 16:32:39 +0000 (7 08:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 16:32:39 +0000 (7 08:32 -0800)
treea4aec7b18ffe8d8dd88e027e5e4d84b2d838fe8a
parent8f0cb147b2fb12427bf6abef7fed2b604557a41e
parentc6ea2ba7b8acdb6c4a883b2d38607c8078dff4ee
Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block
Makefile
block/as-iosched.c
block/ll_rw_blk.c