summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-08-05 13:59:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-08-05 13:59:38 -0700
commit4d5398a3ec060c1e3094097e52a19a4d0013c0e0 (patch)
tree1cad42aad30a42ceb400c7afc580640bb65fe4f0 /include
parent9e2f40233670c70c25e0681cb66d50d1e2742829 (diff)
parent52e0ea900202d23843daee8f7089817e81dd3dd7 (diff)
downloadlinux-4d5398a3ec060c1e3094097e52a19a4d0013c0e0.tar.bz2
Merge tag 'for-linus' of github.com:openrisc/linux
Pull OpenRISC updates from Stafford Horne: "In this cycle we add PCI support to OpenRISC used in our new QEMU virt platform. The main updates from me include: - Kconfig updates to support OpenRISC PCI (just config now after the PCI cleanups I did on Bjorn's branch) - A new defconfig for the qemu virt platform. - Also there is one MAINTAINERS update. As I was working on the PCI series we kept getting bounces from Richard's old email address. I added this here; I am not sure how these are usually handled when the maintainer doesn't queue it themselves" * tag 'for-linus' of github.com:openrisc/linux: openrisc: io: Define iounmap argument as volatile MAINTAINERS: Update Richard Henderson's address openrisc: Add virt defconfig openrisc: Add pci bus support
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions