Merge tag 'for-linus' of git://github.com/openrisc/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jan 2021 00:39:36 +0000 (16:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jan 2021 00:39:36 +0000 (16:39 -0800)
Pull OpenRISC fix from Stafford Horne:
 "Fix config dependencies for Litex SOC driver causing issues on um"

* tag 'for-linus' of git://github.com/openrisc/linux:
  soc: litex: Properly depend on HAS_IOMEM


Trivial merge