diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-18 17:42:59 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-18 17:42:59 +0100 |
| commit | 92b674b62a1aec734280c9019cfb3b3745044b66 (patch) | |
| tree | a62bfa8ba7280bed9e5aaf14f56dbacd714d4757 | |
| parent | 6a6fa68ae2884cc1834110e549faa9cd86050ce6 (diff) | |
| parent | 2e4cad283372c8e7e2db1fd4b0c6f2cb0b9122fb (diff) | |
| download | qemu-92b674b62a1aec734280c9019cfb3b3745044b66.tar.gz qemu-92b674b62a1aec734280c9019cfb3b3745044b66.tar.bz2 qemu-92b674b62a1aec734280c9019cfb3b3745044b66.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
QOM CPUState and X86CPU
* MAINTAINERS cleanup
# gpg: Signature made Mon 18 Apr 2016 17:23:16 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-cpu-for-peter:
MAINTAINERS: Drop target-i386 from CPU subsystem
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1c30dfa993..28e2b17049 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1050,7 +1050,6 @@ M: Andreas Färber <afaerber@suse.de> S: Supported F: qom/cpu.c F: include/qom/cpu.h -F: target-i386/cpu.c ICC Bus M: Igor Mammedov <imammedo@redhat.com> |