Linux 3.4.84

Conflicts:
	arch/powerpc/kernel/reloc_64.S