Linux 3.4.75

Conflicts:
	arch/mips/mm/dma-default.c