Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
Ingo Molnar [Fri, 26 Oct 2012 08:17:38 +0000 (10:17 +0200)]
Pull EFI fixes from Matt Fleming:

 "Fix oops with EFI variables on mixed 32/64-bit firmware/kernels and
  document EFI git repository location on kernel.org."

Conflicts:
arch/x86/include/asm/efi.h

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

1  2 
MAINTAINERS
arch/x86/include/asm/efi.h
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c

diff --cc MAINTAINERS
Simple merge
@@@ -98,7 -98,7 +98,8 @@@ extern void efi_set_executable(efi_memo
  extern int efi_memblock_x86_reserve_range(void);
  extern void efi_call_phys_prelog(void);
  extern void efi_call_phys_epilog(void);
+ extern void efi_unmap_memmap(void);
 +extern void efi_memory_uc(u64 addr, unsigned long size);
  
  #ifndef CONFIG_EFI
  /*
Simple merge
Simple merge