Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-net

diff --cc Makefile
index 5dc9b69,6336c5b..787c8a8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -586,11 -556,10 +586,12 @@@ CLEAN_FILES += 
        drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
        drivers/scsi/aic7xxx/aicasm/y.tab.h \
        drivers/scsi/aic7xxx/aicasm/aicasm \
 -      drivers/scsi/53c700_d.h \
 +      drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
 +      drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
 +      drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
-       net/khttpd/make_times_h \
-       net/khttpd/times.h \
+       net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
+       net/802/pseudo/pseudocode.h \
+       net/khttpd/make_times_h net/khttpd/times.h \
        submenu*
  
  #     files removed with 'make mrproper'

diff --cc drivers/block/genhd.c
Simple merge

diff --cc net/Makefile
Simple merge

diff --cc net/core/dev.c
Simple merge