Merge power-supply fixes for 6.7 cycle
authorSebastian Reichel <sebastian.reichel@collabora.com>
Sun, 14 Jan 2024 20:38:31 +0000 (21:38 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Sun, 14 Jan 2024 20:38:31 +0000 (21:38 +0100)
Merge power-supply fixes branch, which I never send for
the v6.7 cycle.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Trivial merge