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)
commit03e319e5465a2da6fb188c77043775f2888df529
tree303afaf6b31a110d27bbc2fcee0f68648fb2665f
parent8c947645151cc2c279c75c7f640dd8f0fc0b9aa2
parent1bea2a937dadd188de70198b0cf3915e05a506e4
Merge tag 'for-linus' of git://github.com/openrisc/linux

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