Linux 3.4.31 - 3.4.40

Conflicts:

	net/ipv4/ping.c

Conflicts:

	arch/xtensa/include/asm/signal.h