Linux 3.4.97

Conflicts:
	arch/mips/kernel/irq-msc01.c
	arch/powerpc/lib/sstep.c