Linux 3.4.16

Conflicts:
	Makefile
	arch/x86/kernel/setup.c
	net/ipv6/tcp_ipv6.c