Linux 3.0.70

Conflicts:

	arch/powerpc/kernel/cputable.c
	arch/s390/include/asm/tlbflush.h