]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c8daf1 214fd23)
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Mon, 30 Dec 2002 19:32:59 +0000 (13:32 -0600)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Mon, 30 Dec 2002 19:32:59 +0000 (13:32 -0600)
into tp1.ruhr-uni-bochum.de:/scratch/kai/linux-2.5.make

1  2 
arch/i386/Makefile patch | diff1 | diff2 | blob | history

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