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)
commit3f3ee43a462344f6509bd15c988e39d330af91b3
tree6216bebf8665e3aee2c9a47972d36d9761086543
parentc6ac7188c1142c450eb601563ad69204bf1e9286
parent870b4333a62e45b0b2000d14b301b7b8b8cad9da
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

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