Rebase with upstream.

Author: jhodapp

esp32-wroom-rp/src/lib.rs

@@ -73,10 +73,10 @@
 //!     // Grab our singleton objects
 //!     let mut pac = pac::Peripherals::take().unwrap();
 //!     let core = pac::CorePeripherals::take().unwrap();
-
+//!
 //!     // Set up the watchdog driver - needed by the clock setup code
 //!     let mut watchdog = hal::Watchdog::new(pac.WATCHDOG);
-
+//!
 //!     // Configure the clocks
 //!     let clocks = hal::clocks::init_clocks_and_plls(
 //!         XTAL_FREQ_HZ,