CVS Update@oss.sgi.com: linux

[Ralf Baechle <ralf@oss.sgi.com>]

CVSROOT:        /home/pub/cvs
Module name:    linux
Changes by:     ralf@oss.sgi.com        00/08/08 11:28:31

Modified files:
        .              : CREDITS Makefile Rules.make 
        Documentation  : Changes Configure.help README.DAC960 
                         kernel-parameters.txt 
        Documentation/ia64: README 
        Documentation/networking: ethertap.txt 
        Documentation/vm: numa 
        arch/mips      : defconfig defconfig-ip22 defconfig-rm200 
        arch/ppc       : vmlinux.lds 
        drivers/block  : DAC960.c DAC960.h 
        drivers/pci    : quirks.c 
        fs             : buffer.c 
        fs/ext2        : inode.c 
        include/asm-i386: semaphore.h 
        include/linux  : pci_ids.h 
        include/linux/netfilter_ipv4: ip_conntrack.h 
                                      ip_conntrack_helper.h 
                                      ip_conntrack_tuple.h 
                                      ip_nat_helper.h 
        net/core       : netfilter.c 
        net/ipv4/netfilter: Makefile ip_conntrack_core.c 
                            ip_conntrack_ftp.c ip_conntrack_proto_tcp.c 
                            ip_conntrack_proto_udp.c 
                            ip_conntrack_standalone.c ip_fw_compat.c 
                            ip_fw_compat_redir.c ip_nat_core.c 
                            ip_nat_ftp.c ip_nat_proto_udp.c ip_queue.c 
                            ip_tables.c 
Added files:
        include/linux/netfilter_ipv4: ip_conntrack_tcp.h 

Log message:
        Merge with Linux 2.4.0-test6-pre3.