manual merge of x86/efi

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/platform/efi/efi.c
index cceb813044efc5dfdcbaf9fddbd076b23b2d1dc1,f8ec4dafc74e5e94011c3f092f17f4c1b3f40109..7d8caccbf2f3547509a0d16ac5b3787433fbace4
--- 1/arch/x86/platform/efi/efi.c
--- 2/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@@ -684,15 -686,19 +686,12 @@@ void __init efi_init(void
                        return;
                set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
        }
--
        if (efi_memmap_init())
                return;
  
        set_bit(EFI_MEMMAP, &x86_efi_facility);
  
- #if EFI_DEBUG
 -#ifdef CONFIG_X86_32
 -      if (efi_is_native()) {
 -              x86_platform.get_wallclock = efi_get_time;
 -              x86_platform.set_wallclock = efi_set_rtc_mmss;
 -      }
 -#endif
        print_efi_memmap();
- #endif
  }
  
  void __init efi_late_init(void)

diff --cc include/linux/efi.h
Simple merge