tree 338e5093e343aaea9da9018ce71a5814c799437d
parent 28ddafa5905310889defc485dbefe0a484edb2b6
parent f6697df36bdf0bf7fce984605c2918d4a7b4269f
author Linus Torvalds <torvalds@linux-foundation.org> 1479140784 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1479140784 -0800

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

Pull EFI fixes from Ingo Molnar:
 "A boot crash fix and a build warning fix"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Prevent mixed mode boot corruption with CONFIG_VMAP_STACK=y
  x86/efi: Fix EFI memmap pointer size warning