diff options
| author | Peter Maydell | 2014-10-22 19:41:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-10-22 19:41:38 +0200 |
| commit | 60b6381ffb4fa444b500cbb4a0c832c4bfb7ba89 (patch) | |
| tree | cef2d85acffd6551f049e4496b03043b576feacb | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | s390x: sweep up unmaintained files (diff) | |
| download | qemu-60b6381ffb4fa444b500cbb4a0c832c4bfb7ba89.tar.gz qemu-60b6381ffb4fa444b500cbb4a0c832c4bfb7ba89.tar.xz qemu-60b6381ffb4fa444b500cbb4a0c832c4bfb7ba89.zip | |
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-- | MAINTAINERS | 6 |
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 |