tree d31b0639244cbcaca2957b1c0c6c05686d4aeffa
parent 4c64616bb51b399886ded8f4f69bad4da2da1817
parent 1adbfa3511ee1c1118e16a9a0246870f12fef4e6
author Linus Torvalds <torvalds@linux-foundation.org> 1332433891 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1332433891 -0700

Merge branch 'x86-eficross-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/eficross (booting 32/64-bit kernel from 64/32-bit EFI) from Ingo Molnar

* 'x86-eficross-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: Allow basic init with mixed 32/64-bit efi/kernel
  x86, efi: Add basic error handling
  x86, efi: Cleanup config table walking
  x86, efi: Convert printk to pr_*()
  x86, efi: Refactor efi_init() a bit