]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cce0cac 85d1494)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 23:21:22 +0000 (15:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 23:21:22 +0000 (15:21 -0800)
1  2 
arch/mips/cobalt/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/mips/cobalt/setup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.