Merge tag 'for-linus' of git://github.com/openrisc/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Sep 2019 20:46:44 +0000 (13:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Sep 2019 20:46:44 +0000 (13:46 -0700)
commit1e24aaabdee9e07f19b09bd305ffc069b0b07371
tree316ad0f78053bbc39474a5ed42d7e023702e2a97
parent16da0961d3d5521f6541a422c5485ea4ddfe860b
parentf3b17320db25b4cdd50f0396b096644455357dac
Merge tag 'for-linus' of git://github.com/openrisc/linux

Pull OpenRISC updates from Stafford Horne:
 "Few small things for 5.4:

   - Fixup ethoc ethernet device tree descriptors which were previously
     broken, now ethernet works on FPGAs running OpenRISC!

   - Switch ioremap to use uncached semantics - from Christoph Hellwig"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: map as uncached in ioremap
  or1k: dts: Add ethoc device to SMP devicetree
  or1k: dts: Fix ethoc network configuration in or1ksim devicetree