Linux 3.4.96

Conflicts:
	arch/s390/include/asm/lowcore.h