Linux 3.4.59

Conflicts:
	kernel/futex.c

Change-Id: I37566f23e8a8257435acc44f481c6c929ca39b2a