Linux 3.4.58
Linux 3.4.59

Conflicts:
	kernel/futex.c