]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c58248 77b2eeb)
Merge redhat.com:/home/jgarzik/repo/linus-2.5
authorJeff Garzik <jgarzik@redhat.com>
Fri, 1 Nov 2002 20:55:13 +0000 (15:55 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 1 Nov 2002 20:55:13 +0000 (15:55 -0500)
into redhat.com:/home/jgarzik/repo/minitramfs-2.5

1  2 
init/main.c patch | diff1 | diff2 | blob | history

diff --cc init/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.