mirror of
https://github.com/torvalds/linux.git
synced 2026-04-26 02:22:28 -04:00
Resolve conflicts for Ingo. Conflicts: drivers/firmware/Kconfig drivers/firmware/efivars.c Signed-off-by: Matt Fleming <matt.fleming@intel.com>