]> git.hungrycats.org Git - linux/commitdiff
Merge http://jdike.stearns.org:5000/fixes-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 15 Oct 2002 11:43:52 +0000 (04:43 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 15 Oct 2002 11:43:52 +0000 (04:43 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
arch/um/Makefile
arch/um/Makefile-i386
arch/um/drivers/ubd_kern.c

Simple merge
Simple merge
Simple merge