mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Resolve conflicts for Ingo. Conflicts: drivers/firmware/Kconfig drivers/firmware/efivars.c Signed-off-by: Matt Fleming <matt.fleming@intel.com>