]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92ebc65 556e36f)
Merge http://linux-isdn.bkbits.net/linux-2.5.misc
authorLinus Torvalds <torvalds@home.transmeta.com>
Sun, 14 Apr 2002 14:27:31 +0000 (07:27 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 14 Apr 2002 14:27:31 +0000 (07:27 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

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.