]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit01991780489f0805745a0e4aa91bc5018ea5ed86
tree316ad0f78053bbc39474a5ed42d7e023702e2a97
parentf1fcac1b50771f82a889e97d3092f57b621ba042
parent72b3ebc85e3f99d02a7969e89d902e237aae8ee2
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