Updated commit files taking out failed merge info
	modified:   lib/rwsem-spinlock.c
	modified:   lib/rwsem.c