diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-05 13:59:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-05 13:59:38 -0700 |
| commit | 4d5398a3ec060c1e3094097e52a19a4d0013c0e0 (patch) | |
| tree | 1cad42aad30a42ceb400c7afc580640bb65fe4f0 /MAINTAINERS | |
| parent | 9e2f40233670c70c25e0681cb66d50d1e2742829 (diff) | |
| parent | 52e0ea900202d23843daee8f7089817e81dd3dd7 (diff) | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cea523f64dc1..9fbc30d3c95e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -816,7 +816,7 @@ S: Maintained F: drivers/staging/media/sunxi/cedrus/ ALPHA PORT -M: Richard Henderson <rth@twiddle.net> +M: Richard Henderson <richard.henderson@linaro.org> M: Ivan Kokshaysky <ink@jurassic.park.msu.ru> M: Matt Turner <mattst88@gmail.com> L: linux-alpha@vger.kernel.org |