Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

include/linux/netfilter.h

include/net/ip.h

include/net/xfrm.h

net/ipv4/ip_gre.c

net/ipv4/ip_output.c

net/ipv4/ipip.c

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

net/ipv4/xfrm4_output.c

net/ipv6/icmp.c

net/ipv6/netfilter/ip6t_REJECT.c

net/netfilter/Kconfig

net/netfilter/nf_conntrack_core.c

net/netfilter/nf_conntrack_proto_tcp.c

net/netfilter/nf_conntrack_proto_udp.c