Merge branch 'linux-3.4.y'

Conflicts:
	net/ipv4/ping.c
	net/ipv6/route.c