Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linus-2.5.vm
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Wed, 3 Apr 2002 02:45:19 +0000 (20:45 -0600)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Wed, 3 Apr 2002 02:45:19 +0000 (20:45 -0600)
commit312ba443079c2264340c14efc0fc1791174b47f8
treefd2b424abf56bc6c71ecbb1e2a7db52e20715bab
parent8cceac248d17302bffec61f3468fb19f262626f1
parentf46fddf0e9848cf78bc172b623bb1fe10d13d1eb
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linus-2.5.vm
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-list-multi
net/ipv4/netfilter/Makefile