Linux 3.4.49

Conflicts:
	arch/powerpc/platforms/pseries/eeh_pseries.c

Conflicts:
	Makefile