Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux

Makefile

@@ -270,8 +270,6 @@ NETWORKS	+= $(patsubst %/, %/built-in.o, $(networks-y))
 SUBDIRS		+= $(patsubst %/,%,$(filter %/, $(libs-y) $(libs-m)))
 LIBS		+= $(patsubst %/, %/lib.a, $(libs-y))
 
-$(warning $(SUBDIRS))
-
 export	NETWORKS DRIVERS LIBS HEAD LDFLAGS MAKEBOOT
 
 # boot target

scripts/mkcompile_h

@@ -67,8 +67,8 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
 # first line.
 
 if [ -r $TARGET ] && \
-      grep -v 'auto generated\|UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
-      grep -v 'auto generated\|UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
+      grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
+      grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
       cmp -s .tmpver.1 .tmpver.2; then
    echo ' (unchanged)'
    rm -f .tmpcompile