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

diff --cc net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge

diff --cc net/netfilter/nfnetlink_log.c
Simple merge

diff --cc net/netfilter/x_tables.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge