Removed failed merge info
	modified:   lib/rwsem.c