projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c94764 1bea2a9)
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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git