Merge tag 'v3.9' into efi-for-tip2

Resolve conflicts for Ingo.

Conflicts:
	drivers/firmware/Kconfig
	drivers/firmware/efivars.c

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 32bdf4f8e432..5145fa344ad5 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -72,7 +72,7 @@ static int generic_ops_register(void)
         generic_ops.get_variable = efi.get_variable;
         generic_ops.set_variable = efi.set_variable;
         generic_ops.get_next_variable = efi.get_next_variable;
-        generic_ops.query_variable_info = efi.query_variable_info;
+        generic_ops.query_variable_store = efi_query_variable_store;
 
         return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
 }