Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Fri, 26 Oct 2012 08:17:38 +0000 (10:17 +0200)
committerIngo Molnar <mingo@kernel.org>
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>

Trivial merge