Linux 3.4.92

Conflicts:
	kernel/futex.c