Linux 3.4.70

Conflicts:
	net/netfilter/nf_conntrack_sip.c