am 6fe4a58f: Merge "Move stuff only needed by pthread-timers.c into pthread-timers.c."

* commit '6fe4a58f84954523f17114f1f7cf060a3573c073':
  Move stuff only needed by pthread-timers.c into pthread-timers.c.