tree ece82dede09c11725409f0b5f6dd1a8b21855174
parent 99091700659f4df965e138b38b4fa26a29b7eade
parent 6862e6ad95e984991a6ceec592cf67831658f928
author Linus Torvalds <torvalds@linux-foundation.org> 1471030742 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1471030742 -0700

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 fix for EFI capsules and an SGI UV platform fix"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/capsule: Allocate whole capsule into virtual memory
  x86/platform/uv: Skip UV runtime services mapping in the efi_runtime_disabled case