Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Mar 2020 16:57:46 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Mar 2020 16:57:46 +0000 (09:57 -0700)
Pull x86 fix from Ingo Molnar:
 "A build fix with certain Kconfig combinations"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioremap: Fix CONFIG_EFI=n build


Trivial merge