import of linux 3.4.59

Conflicts:
	kernel/futex.c