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