Fix merge errors

esp-hal/CHANGELOG.md

@@ -60,12 +60,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Peripheral driver constructors don't take `InterruptHandler`s anymore. Use `set_interrupt_handler` to explicitly set the interrupt handler now. (#1819)
 - Migrate SPI driver to use DMA buffer objects (#1856, #1985)
 - Use the peripheral ref pattern for `OneShotTimer` and `PeriodicTimer` (#1855)
-- Improve SYSTIMER API (#1870)
-- DMA: don't require `Sealed` to implement `ReadBuffer` and `WriteBuffer` (#1921)
-- Allow DMA to/from psram for esp32s3 (#1827)
-- DMA buffers now don't require a static lifetime. Make sure to never `mem::forget` an in-progress DMA transfer (consider using `#[deny(clippy::mem_forget)]`) (#1837)
-- Peripherals (where possible) are now explicitly reset and enabled in their constructors (#1893)
-- Reset peripherals in driver constructors where missing (#1893, #1961)
 - Improve SYSTIMER API (#1871)
 - SHA driver now use specific structs for the hashing algorithm instead of a parameter. (#1908)
 - Remove `fn free(self)` in HMAC which goes against esp-hal API guidelines (#1972)

esp-hal/src/rtc_cntl/mod.rs

@@ -66,8 +66,6 @@
 //! }
 //! ```
 
-#![allow(missing_docs)] // TODO: Remove when able
-
 use chrono::{DateTime, NaiveDateTime};
 #[cfg(not(any(esp32c6, esp32h2)))]
 use fugit::HertzU32;