From: Tom Rini <trini@konsulko.com>
Date: Thu, 19 Oct 2023 13:39:00 +0000 (-0400)
Subject: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-watchdog
X-Git-Tag: v2024.01-rc1~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48bc9de28228a0fdd30a10f59f23e6a24cb75636;p=pandora-u-boot.git

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-watchdog

- sandbox: watchdog: Avoid an error on startup (Simon)
- nuvoton: Fix reset/expire function error (Jim)
---

48bc9de28228a0fdd30a10f59f23e6a24cb75636