Linux 3.4.79

Conflicts:
	arch/powerpc/kernel/cacheinfo.c