aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-01-25 13:30:23 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-01-25 13:30:23 +0000
commitae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf (patch)
tree93369341e12120f48c7c7a550fb969578dc5268d /MAINTAINERS
parentffb5a69c31b3c2a79ad5b4b9a8e47da83eef6115 (diff)
parente671711c9a8c1de540f035095e18458bc03968de (diff)
downloadqemu-ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf.zip
qemu-ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf.tar.gz
qemu-ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf.tar.bz2
Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into staging
nios2 target support # gpg: Signature made Tue 24 Jan 2017 21:11:47 GMT # gpg: using RSA key 0xAD1270CC4DD0279B # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>" # gpg: aka "Richard Henderson <rth@redhat.com>" # gpg: aka "Richard Henderson <rth@twiddle.net>" # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B * remotes/rth/tags/pull-nios-20170124: nios2: Add support for Nios-II R1 nios2: Add Altera 10M50 GHRD emulation nios2: Add periodic timer emulation nios2: Add IIC interrupt controller emulation nios2: Add usermode binaries emulation nios2: Add disas entries nios2: Add architecture emulation support Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e41271c..a428cb2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -187,6 +187,14 @@ F: disas/moxie.c
F: hw/moxie/
F: default-configs/moxie-softmmu.mak
+NiosII
+M: Chris Wulff <crwulff@gmail.com>
+M: Marek Vasut <marex@denx.de>
+S: Maintained
+F: target/nios2/
+F: hw/nios2/
+F: disas/nios2.c
+
OpenRISC
M: Jia Liu <proljc@gmail.com>
S: Maintained