[PATCH roland/nptl-s390] S390: Consolidate nptl/ subdirectories under linux/...

[Roland McGrath]

I've committed all the changes on the branch now.  For this last one, I
consolidated the identical files into the common s390/ directory.

Thanks,
Roland