Resolve conflicts for Ingo.

Conflicts:
	drivers/firmware/Kconfig
	drivers/firmware/efivars.c
Signed-off-by: NMatt Fleming <matt.fleming@intel.com>