]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 236fa08 2824bc9)
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)
1  2 
drivers/block/elevator.c patch | diff1 | diff2 | blob | history
drivers/block/ll_rw_blk.c patch | diff1 | diff2 | blob | history

diff --cc drivers/block/elevator.c
Simple merge
diff --cc drivers/block/ll_rw_blk.c
Simple merge
Linux 2.6 source tree