summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPeter Maydell2015-04-28 13:22:20 +0200
committerPeter Maydell2015-04-28 13:22:20 +0200
commit84cbd63f87c1d246f51ec8eee5367a5588f367fd (patch)
tree0bff41cb70defd0a31cedfc91dcb8970dd4aae2c /MAINTAINERS
parentMerge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into s... (diff)
parenttarget-i386: Remove AMD feature flag aliases from CPU model table (diff)
downloadqemu-84cbd63f87c1d246f51ec8eee5367a5588f367fd.tar.gz
qemu-84cbd63f87c1d246f51ec8eee5367a5588f367fd.tar.xz
qemu-84cbd63f87c1d246f51ec8eee5367a5588f367fd.zip
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2015-04-27 (v2) # gpg: Signature made Mon Apr 27 19:42:39 2015 BST using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-pull-request: target-i386: Remove AMD feature flag aliases from CPU model table target-i386: X86CPU::xlevel2 QOM property target-i386: Make "level" and "xlevel" properties static qemu-config: Accept empty option values MAINTAINERS: Change status of X86 to Maintained MAINTAINERS: Add myself to X86 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 978e714e4d..7aab80b59f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -172,7 +172,8 @@ F: hw/unicore32/
X86
M: Paolo Bonzini <pbonzini@redhat.com>
M: Richard Henderson <rth@twiddle.net>
-S: Odd Fixes
+M: Eduardo Habkost <ehabkost@redhat.com>
+S: Maintained
F: target-i386/
F: hw/i386/