]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83391be a7152cf)
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 patch | diff1 | diff2 | blob | history
arch/um/Makefile-i386 patch | diff1 | diff2 | blob | history
arch/um/drivers/ubd_kern.c patch | diff1 | diff2 | blob | history

diff --cc arch/um/Makefile
Simple merge
diff --cc arch/um/Makefile-i386
Simple merge
diff --cc arch/um/drivers/ubd_kern.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.