Merge branch 'master' of /repos/git/net-next-2.6
authorPatrick McHardy <kaber@trash.net>
Tue, 15 Jun 2010 15:31:06 +0000 (17:31 +0200)
committerPatrick McHardy <kaber@trash.net>
Tue, 15 Jun 2010 15:31:06 +0000 (17:31 +0200)
commitf9181f4ffc71d7b7dd1906c9a11d51d6659220ae
tree194f22e8216a1b9ee2c0dd019142202d73a7dc87
parent0902b469bd25065aa0688c3cee6f11744c817e7c
parent1ab6c163dee279559e3a62d774af7e4c4c9b4c67
Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c

Signed-off-by: Patrick McHardy <kaber@trash.net>
include/net/netfilter/nf_conntrack.h
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/ipv4/netfilter.c
net/ipv4/netfilter/ip_tables.c
net/ipv6/netfilter/ip6_tables.c
net/netfilter/nf_conntrack_core.c
net/netfilter/xt_TEE.c