Linux 3.4.90

Conflicts:
	arch/mips/power/hibernate.S