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

diff --cc Makefile
Simple merge
Simple merge
Simple merge