diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 22:46:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 22:46:44 +0200 |
commit | 1e24aaabdee9e07f19b09bd305ffc069b0b07371 (patch) | |
tree | 316ad0f78053bbc39474a5ed42d7e023702e2a97 /arch/s390/kernel/head64.S | |
parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... (diff) | |
parent | openrisc: map as uncached in ioremap (diff) | |
download | linux-1e24aaabdee9e07f19b09bd305ffc069b0b07371.tar.xz linux-1e24aaabdee9e07f19b09bd305ffc069b0b07371.zip |
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
Diffstat (limited to 'arch/s390/kernel/head64.S')
0 files changed, 0 insertions, 0 deletions