tree 3a29fedfd77b578a568916ce4c3b6cf2750b8a77
parent 14f97d9713283adfadf2193e287e21d079f72ee7
parent 0ce3cc008ec04258b6a6314b09f1a6012810881a
author Linus Torvalds <torvalds@linux-foundation.org> 1443883601 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1443883601 -0400

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

Pull EFI fixes from Ingo Molnar:
 "Two EFI fixes: one for x86, one for ARM, fixing a boot crash bug that
  can trigger under newer EFI firmware"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME regions
  x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down