mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
We need the fixes in here, and it resolves a merge conflict in: drivers/misc/amd-sbi/Kconfig Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>