Linux 3.4.50

Conflicts:
	arch/powerpc/include/asm/exception-64s.h

Conflicts:
	Makefile