Linux 3.0.78

Conflicts:

	arch/powerpc/mm/numa.c