]> git.hungrycats.org Git - linux/commitdiff
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Thu, 12 Jun 2003 07:40:32 +0000 (02:40 -0500)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Thu, 12 Jun 2003 07:40:32 +0000 (02:40 -0500)
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make

1  2 
Makefile

diff --cc Makefile
Simple merge