Rollup merge of rust-lang#22633 - wesleywiser:fix_22586, r=sfackler

 AtomicOption was removed in 7d8d06f
but the docs weren't updated.

Fixes rust-lang#22586

Author: Manishearth

src/libcore/atomic.rs

@@ -15,7 +15,7 @@
 //! types.
 //!
 //! This module defines atomic versions of a select number of primitive
-//! types, including `AtomicBool`, `AtomicIsize`, `AtomicUsize`, and `AtomicOption`.
+//! types, including `AtomicBool`, `AtomicIsize`, and `AtomicUsize`.
 //! Atomic types present operations that, when used correctly, synchronize
 //! updates between threads.
 //!