aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-10-22 18:41:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-10-22 18:41:38 +0100
commit60b6381ffb4fa444b500cbb4a0c832c4bfb7ba89 (patch)
treecef2d85acffd6551f049e4496b03043b576feacb
parent8f4699d873bef81cec95db6da53d4c33f8caf4b9 (diff)
parent4277af19d93b227dc439b7f059672b16614524f3 (diff)
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141021' into staging
add missing s390x files to MAINTAINERS # gpg: Signature made Tue 21 Oct 2014 11:57:12 BST using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>" # gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" * remotes/cohuck/tags/s390x-20141021: s390x: sweep up unmaintained files Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--MAINTAINERS6
1 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 206bf7ea45..8eed800a37 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -198,7 +198,9 @@ M: Cornelia Huck <cornelia.huck@de.ibm.com>
M: Alexander Graf <agraf@suse.de>
S: Maintained
F: target-s390x/kvm.c
-F: hw/intc/s390_flic.[hc]
+F: hw/intc/s390_flic.c
+F: hw/intc/s390_flic_kvm.c
+F: include/hw/s390x/s390_flic.h
X86
M: Marcelo Tosatti <mtosatti@redhat.com>
@@ -521,6 +523,8 @@ F: hw/s390x/s390-virtio-ccw.c
F: hw/s390x/css.[hc]
F: hw/s390x/sclp*.[hc]
F: hw/s390x/ipl*.[hc]
+F: include/hw/s390x/
+F: pc-bios/s390-ccw/
T: git git://github.com/cohuck/qemu virtio-ccw-upstr
UniCore32 Machines