Merge with Linux 2.4.0-test6-pre3.linux-2.4.0-test6-pre3
commit6a9366db547e958e8c9bf8e1c13bcea6cb2bf393
authorRalf Baechle <ralf@linux-mips.org>
Tue, 8 Aug 2000 18:28:30 +0000 (8 18:28 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 8 Aug 2000 18:28:30 +0000 (8 18:28 +0000)
treea4ace45b2343a439688f78d7edb6ee0f1d6d41cc
parent02f8110d6a247d53b489b29eec8a35c85e713c6b
Merge with Linux 2.4.0-test6-pre3.
40 files changed:
CREDITS
Documentation/Changes
Documentation/Configure.help
Documentation/README.DAC960
Documentation/ia64/README
Documentation/kernel-parameters.txt
Documentation/networking/ethertap.txt
Documentation/vm/numa
Makefile
Rules.make
arch/mips/defconfig
arch/mips/defconfig-ip22
arch/mips/defconfig-rm200
arch/ppc/vmlinux.lds
drivers/block/DAC960.c
drivers/block/DAC960.h
drivers/pci/quirks.c
fs/buffer.c
fs/ext2/inode.c
include/asm-i386/semaphore.h
include/linux/netfilter_ipv4/ip_conntrack.h
include/linux/netfilter_ipv4/ip_conntrack_helper.h
include/linux/netfilter_ipv4/ip_conntrack_tcp.h [new file with mode: 0644]
include/linux/netfilter_ipv4/ip_conntrack_tuple.h
include/linux/netfilter_ipv4/ip_nat_helper.h
include/linux/pci_ids.h
net/core/netfilter.c
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_ftp.c
net/ipv4/netfilter/ip_conntrack_proto_tcp.c
net/ipv4/netfilter/ip_conntrack_proto_udp.c
net/ipv4/netfilter/ip_conntrack_standalone.c
net/ipv4/netfilter/ip_fw_compat.c
net/ipv4/netfilter/ip_fw_compat_redir.c
net/ipv4/netfilter/ip_nat_core.c
net/ipv4/netfilter/ip_nat_ftp.c
net/ipv4/netfilter/ip_nat_proto_udp.c
net/ipv4/netfilter/ip_queue.c
net/ipv4/netfilter/ip_tables.c