Merge 3.4.39 upstream

Conflicts:

	arch/arm/mm/dma-mapping.c
	drivers/base/power/main.c
	fs/jbd2/transaction.c
	include/linux/sched.h
	mm/madvise.c
	net/irda/af_irda.c