Merge branch 'nf-next' of git://1984.lsi.us.es/net-next

diff --cc include/net/ip6_route.h
Simple merge

diff --cc net/ipv6/route.c
Simple merge

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

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

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