Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

Documentation/feature-removal-schedule.txt

Documentation/kernel-parameters.txt

include/linux/ip_vs.h

include/linux/netfilter_ipv4/ipt_LOG.h

include/linux/netfilter_ipv6/ip6t_LOG.h

include/net/netfilter/nf_conntrack_acct.h

include/net/netfilter/nf_nat_rule.h

net/bridge/br_netfilter.c

net/bridge/br_private.h

net/bridge/br_sysfs_br.c

net/ipv4/netfilter/ipt_LOG.c

net/ipv4/netfilter/ipt_NETMAP.c

net/ipv4/netfilter/nf_nat_rule.c

net/ipv4/netfilter/nf_nat_standalone.c

net/ipv6/netfilter/ip6t_LOG.c

net/netfilter/Kconfig

net/netfilter/ipvs/ip_vs_conn.c

net/netfilter/ipvs/ip_vs_core.c

net/netfilter/ipvs/ip_vs_ctl.c

net/netfilter/nf_conntrack_acct.c