Linux 3.4.40

Conflicts:
	arch/alpha/kernel/sys_nautilus.c
	arch/powerpc/platforms/pseries/lpar.c

Conflicts:
	Makefile