Linux 3.4.16

Conflicts:
	net/ipv6/tcp_ipv6.c