import of linux 3.4.39

Conflicts:
	arch/arm/mm/dma-mapping.c
	kernel/signal.c